π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
feat: estimates revamp and space app refactor (#4742)
sriram veeraghanta59fdd611e4b8
diff --git a/apiserver/plane/api/views/cycle.py b/apiserver/plane/api/views/cycle.pyindex 6e1e5e057f..d1e1917a4c 100644--- a/apiserver/plane/api/views/cycle.py+++ b/apiserver/plane/api/views/cycle.py@@ -784,6 +784,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):def post(self, request, slug, project_id, cycle_id):new_cycle_id = request.data.get("new_cycle_id", False)+ plot_type = request.GET.get("plot_type", "issues")if not new_cycle_id:return Response(@@ -865,6 +866,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):queryset=old_cycle.first(),slug=slug,project_id=project_id,+ plot_type=plot_type,cycle_id=cycle_id,)diff --git a/apiserver/plane/api/views/project.py b/apiserver/plane/api/views/project.pyindex 019ab704ec..408e14fed0 100644--- a/apiserver/plane/api/views/project.py+++ b/apiserver/plane/api/views/project.py@@ -22,7 +22,7 @@ from plane.db.models import (IssueProperty,Module,Project,- ProjectDeployBoard,+ DeployBoard,ProjectMember,State,Workspace,@@ -99,7 +99,7 @@ class ProjectAPIEndpoint(BaseAPIView):).annotate(is_deployed=Exists(- ProjectDeployBoard.objects.filter(+ DeployBoard.objects.filter(project_id=OuterRef("pk"),workspace__slug=self.kwargs.get("slug"),)diff --git a/apiserver/plane/app/serializers/__init__.py b/apiserver/plane/app/serializers/__init__.pyindex bdcdf6c0de..d8364f9314 100644--- a/apiserver/plane/app/serializers/__init__.py+++ b/apiserver/plane/app/serializers/__init__.py@@ -30,7 +30,7 @@ from .project import (ProjectIdentifierSerializer,ProjectLiteSerializer,ProjectMemberLiteSerializer,- ProjectDeployBoardSerializer,+ DeployBoardSerializer,ProjectMemberAdminSerializer,ProjectPublicMemberSerializer,ProjectMemberRoleSerializer,diff --git a/apiserver/plane/app/serializers/estimate.py b/apiserver/plane/app/serializers/estimate.pyindex d28f38c75a..e73b5ceefa 100644--- a/apiserver/plane/app/serializers/estimate.py+++ b/apiserver/plane/app/serializers/estimate.py@@ -11,10 +11,6 @@ from rest_framework import serializersclass EstimateSerializer(BaseSerializer):- workspace_detail = WorkspaceLiteSerializer(- read_only=True, source="workspace"- )- project_detail = ProjectLiteSerializer(read_only=True, source="project")class Meta:model = Estimate@@ -48,10 +44,6 @@ class EstimatePointSerializer(BaseSerializer):class EstimateReadSerializer(BaseSerializer):points = EstimatePointSerializer(read_only=True, many=True)- workspace_detail = WorkspaceLiteSerializer(- read_only=True, source="workspace"- )- project_detail = ProjectLiteSerializer(read_only=True, source="project")class Meta:model = Estimatediff --git a/apiserver/plane/app/serializers/module.py b/apiserver/plane/app/serializers/module.pyindex 28d28d7dbc..7762d3b800 100644--- a/apiserver/plane/app/serializers/module.py+++ b/apiserver/plane/app/serializers/module.py@@ -177,6 +177,8 @@ class ModuleSerializer(DynamicBaseSerializer):started_issues = serializers.IntegerField(read_only=True)unstarted_issues = serializers.IntegerField(read_only=True)backlog_issues = serializers.IntegerField(read_only=True)+ total_estimate_points = serializers.IntegerField(read_only=True)+ completed_estimate_points = serializers.IntegerField(read_only=True)class Meta:model = Module@@ -201,6 +203,8 @@ class ModuleSerializer(DynamicBaseSerializer):"external_id","logo_props",# computed fields+ "total_estimate_points",+ "completed_estimate_points","is_favorite","total_issues","cancelled_issues",diff --git a/apiserver/plane/app/serializers/project.py b/apiserver/plane/app/serializers/project.pyindex 96d92f3404..1bbc580c11 100644--- a/apiserver/plane/app/serializers/project.py+++ b/apiserver/plane/app/serializers/project.py@@ -13,7 +13,7 @@ from plane.db.models import (ProjectMember,ProjectMemberInvite,ProjectIdentifier,- ProjectDeployBoard,+ DeployBoard,ProjectPublicMember,)@@ -114,7 +114,7 @@ class ProjectListSerializer(DynamicBaseSerializer):is_member = serializers.BooleanField(read_only=True)sort_order = serializers.FloatField(read_only=True)member_role = serializers.IntegerField(read_only=True)- is_deployed = serializers.BooleanField(read_only=True)+ anchor = serializers.CharField(read_only=True)members = serializers.SerializerMethodField()def get_members(self, obj):@@ -148,7 +148,7 @@ class ProjectDetailSerializer(BaseSerializer):is_member = serializers.BooleanField(read_only=True)sort_order = serializers.FloatField(read_only=True)member_role = serializers.IntegerField(read_only=True)- is_deployed = serializers.BooleanField(read_only=True)+ anchor = serializers.CharField(read_only=True)class Meta:model = Project@@ -206,14 +206,14 @@ class ProjectMemberLiteSerializer(BaseSerializer):read_only_fields = fields-class ProjectDeployBoardSerializer(BaseSerializer):+class DeployBoardSerializer(BaseSerializer):project_details = ProjectLiteSerializer(read_only=True, source="project")workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")class Meta:- model = ProjectDeployBoard+ model = DeployBoardfields = "__all__"read_only_fields = ["workspace",diff --git a/apiserver/plane/app/urls/estimate.py b/apiserver/plane/app/urls/estimate.pyindex d8571ff0c9..7db94aa46c 100644--- a/apiserver/plane/app/urls/estimate.py+++ b/apiserver/plane/app/urls/estimate.py@@ -4,6 +4,7 @@ from django.urls import pathfrom plane.app.views import (ProjectEstimatePointEndpoint,BulkEstimatePointEndpoint,+ EstimatePointEndpoint,)@@ -34,4 +35,23 @@ urlpatterns = [),name="bulk-create-estimate-points",),+ path(+ "workspaces/<str:slug>/projects/<uuid:project_id>/estimates/<uuid:estimate_id>/estimate-points/",+ EstimatePointEndpoint.as_view(+ {+ "post": "create",+ }+ ),+ name="estimate-points",+ ),+ path(+ "workspaces/<str:slug>/projects/<uuid:project_id>/estimates/<uuid:estimate_id>/estimate-points/<estimate_point_id>/",+ EstimatePointEndpoint.as_view(+ {+ "patch": "partial_update",+ "delete": "destroy",+ }+ ),+ name="estimate-points",+ ),]diff --git a/apiserver/plane/app/urls/project.py b/apiserver/plane/app/urls/project.pyindex 7ea636df8e..0807c7616a 100644--- a/apiserver/plane/app/urls/project.py+++ b/apiserver/plane/app/urls/project.py@@ -2,6 +2,7 @@ from django.urls import pathfrom plane.app.views import (ProjectViewSet,+ DeployBoardViewSet,ProjectInvitationsViewset,ProjectMemberViewSet,ProjectMemberUserEndpoint,@@ -12,7 +13,6 @@ from plane.app.views import (ProjectFavoritesViewSet,UserProjectInvitationsViewset,ProjectPublicCoverImagesEndpoint,- ProjectDeployBoardViewSet,UserProjectRolesEndpoint,ProjectArchiveUnarchiveEndpoint,)@@ -157,7 +157,7 @@ urlpatterns = [),path("workspaces/<str:slug>/projects/<uuid:project_id>/project-deploy-boards/",- ProjectDeployBoardViewSet.as_view(+ DeployBoardViewSet.as_view({"get": "list","post": "create",@@ -167,7 +167,7 @@ urlpatterns = [),path("workspaces/<str:slug>/projects/<uuid:project_id>/project-deploy-boards/<uuid:pk>/",- ProjectDeployBoardViewSet.as_view(+ DeployBoardViewSet.as_view({"get": "retrieve","patch": "partial_update",diff --git a/apiserver/plane/app/views/__init__.py b/apiserver/plane/app/views/__init__.pyindex 0c489593d6..8da0268b9a 100644--- a/apiserver/plane/app/views/__init__.py+++ b/apiserver/plane/app/views/__init__.py@@ -4,7 +4,7 @@ from .project.base import (ProjectUserViewsEndpoint,ProjectFavoritesViewSet,ProjectPublicCoverImagesEndpoint,- ProjectDeployBoardViewSet,+ DeployBoardViewSet,ProjectArchiveUnarchiveEndpoint,)@@ -190,6 +190,7 @@ from .external.base import (from .estimate.base import (ProjectEstimatePointEndpoint,BulkEstimatePointEndpoint,+ EstimatePointEndpoint,)from .inbox.base import InboxViewSet, InboxIssueViewSetdiff --git a/apiserver/plane/app/views/analytic/base.py b/apiserver/plane/app/views/analytic/base.pyindex 256d3cae5b..3d27641e3c 100644--- a/apiserver/plane/app/views/analytic/base.py+++ b/apiserver/plane/app/views/analytic/base.py@@ -33,7 +33,7 @@ class AnalyticsEndpoint(BaseAPIView):"state__group","labels__id","assignees__id",- "estimate_point",+ "estimate_point__value","issue_cycle__cycle_id","issue_module__module_id","priority",@@ -381,9 +381,9 @@ class DefaultAnalyticsEndpoint(BaseAPIView):)open_estimate_sum = open_issues_queryset.aggregate(- sum=Sum("estimate_point")+ sum=Sum("point"))["sum"]- total_estimate_sum = base_issues.aggregate(sum=Sum("estimate_point"))[+ total_estimate_sum = base_issues.aggregate(sum=Sum("point"))["sum"]diff --git a/apiserver/plane/app/views/cycle/archive.py b/apiserver/plane/app/views/cycle/archive.pyindex 5e1241b08f..f99c2ec972 100644--- a/apiserver/plane/app/views/cycle/archive.py+++ b/apiserver/plane/app/views/cycle/archive.py@@ -177,6 +177,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):)def get(self, request, slug, project_id, pk=None):+ plot_type = request.GET.get("plot_type", "issues")if pk is None:queryset = (self.get_queryset()@@ -375,6 +376,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):queryset=queryset,slug=slug,project_id=project_id,+ plot_type=plot_type,cycle_id=pk,)diff --git a/apiserver/plane/app/views/cycle/base.py b/apiserver/plane/app/views/cycle/base.pyindex 5982daf7f9..91012748fe 100644--- a/apiserver/plane/app/views/cycle/base.py+++ b/apiserver/plane/app/views/cycle/base.py@@ -17,8 +17,11 @@ from django.db.models import (UUIDField,Value,When,+ Subquery,+ Sum,+ IntegerField,)-from django.db.models.functions import Coalesce+from django.db.models.functions import Coalesce, Castfrom django.utils import timezonefrom django.core.serializers.json import DjangoJSONEncoder@@ -73,6 +76,89 @@ class CycleViewSet(BaseViewSet):project_id=self.kwargs.get("project_id"),workspace__slug=self.kwargs.get("slug"),)+ backlog_estimate_point = (+ Issue.issue_objects.filter(+ estimate_point__estimate__type="points",+ state__group="backlog",+ issue_cycle__cycle_id=OuterRef("pk"),+ )+ .values("issue_cycle__cycle_id")+ .annotate(+ backlog_estimate_point=Sum(+ Cast("estimate_point__value", IntegerField())+ )+ )+ .values("backlog_estimate_point")[:1]+ )+ unstarted_estimate_point = (+ Issue.issue_objects.filter(+ estimate_point__estimate__type="points",+ state__group="unstarted",+ issue_cycle__cycle_id=OuterRef("pk"),+ )+ .values("issue_cycle__cycle_id")+ .annotate(+ unstarted_estimate_point=Sum(+ Cast("estimate_point__value", IntegerField())+ )+ )+ .values("unstarted_estimate_point")[:1]+ )+ started_estimate_point = (+ Issue.issue_objects.filter(+ estimate_point__estimate__type="points",+ state__group="started",+ issue_cycle__cycle_id=OuterRef("pk"),+ )+ .values("issue_cycle__cycle_id")+ .annotate(+ started_estimate_point=Sum(+ Cast("estimate_point__value", IntegerField())+ )+ )+ .values("started_estimate_point")[:1]+ )+ cancelled_estimate_point = (+ Issue.issue_objects.filter(+ estimate_point__estimate__type="points",+ state__group="cancelled",+ issue_cycle__cycle_id=OuterRef("pk"),+ )+ .values("issue_cycle__cycle_id")+ .annotate(+ cancelled_estimate_point=Sum(+ Cast("estimate_point__value", IntegerField())+ )+ )+ .values("cancelled_estimate_point")[:1]+ )+ completed_estimate_point = (+ Issue.issue_objects.filter(+ estimate_point__estimate__type="points",+ state__group="completed",+ issue_cycle__cycle_id=OuterRef("pk"),+ )+ .values("issue_cycle__cycle_id")+ .annotate(+ completed_estimate_points=Sum(+ Cast("estimate_point__value", IntegerField())+ )+ )+ .values("completed_estimate_points")[:1]+ )+ total_estimate_point = (+ Issue.issue_objects.filter(+ estimate_point__estimate__type="points",+ issue_cycle__cycle_id=OuterRef("pk"),+ )+ .values("issue_cycle__cycle_id")+ .annotate(+ total_estimate_points=Sum(+ Cast("estimate_point__value", IntegerField())+ )+ )+ .values("total_estimate_points")[:1]+ )return self.filter_queryset(super().get_queryset()@@ -197,12 +283,49 @@ class CycleViewSet(BaseViewSet):Value([], output_field=ArrayField(UUIDField())),))+ .annotate(+ backlog_estimate_points=Coalesce(+ Subquery(backlog_estimate_point),+ Value(0, output_field=IntegerField()),+ ),+ )+ .annotate(+ unstarted_estimate_points=Coalesce(+ Subquery(unstarted_estimate_point),+ Value(0, output_field=IntegerField()),+ ),+ )+ .annotate(+ started_estimate_points=Coalesce(+ Subquery(started_estimate_point),+ Value(0, output_field=IntegerField()),+ ),+ )+ .annotate(+ cancelled_estimate_points=Coalesce(+ Subquery(cancelled_estimate_point),+ Value(0, output_field=IntegerField()),+ ),+ )+ .annotate(+ completed_estimate_points=Coalesce(+ Subquery(completed_estimate_point),+ Value(0, output_field=IntegerField()),+ ),+ )+ .annotate(+ total_estimate_points=Coalesce(+ Subquery(total_estimate_point),+ Value(0, output_field=IntegerField()),+ ),+ ).order_by("-is_favorite", "name").distinct())def list(self, request, slug, project_id):queryset = self.get_queryset().filter(archived_at__isnull=True)+ plot_type = request.GET.get("plot_type", "issues")cycle_view = request.GET.get("cycle_view", "all")# Update the order by@@ -233,6 +356,12 @@ class CycleViewSet(BaseViewSet):"progress_snapshot","logo_props",# meta fields+ "backlog_estimate_points",+ "unstarted_estimate_points",+ "started_estimate_points",+ "cancelled_estimate_points",+ "completed_estimate_points",+ "total_estimate_points","is_favorite","total_issues","cancelled_issues",@@ -335,6 +464,7 @@ class CycleViewSet(BaseViewSet):queryset=queryset.first(),slug=slug,project_id=project_id,+ plot_type=plot_type,cycle_id=data[0]["id"],))@@ -359,6 +489,8 @@ class CycleViewSet(BaseViewSet):"progress_snapshot","logo_props",# meta fields+ "completed_estimate_points",+ "total_estimate_points","is_favorite","total_issues","cancelled_issues",@@ -527,6 +659,7 @@ class CycleViewSet(BaseViewSet):return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)def retrieve(self, request, slug, project_id, pk):+ plot_type = request.GET.get("plot_type", "issues")queryset = (self.get_queryset().filter(archived_at__isnull=True).filter(pk=pk))@@ -682,6 +815,7 @@ class CycleViewSet(BaseViewSet):queryset=queryset,slug=slug,project_id=project_id,+ plot_type=plot_type,cycle_id=pk,)@@ -798,6 +932,7 @@ class TransferCycleIssueEndpoint(BaseAPIView):def post(self, request, slug, project_id, cycle_id):new_cycle_id = request.data.get("new_cycle_id", False)+ plot_type = request.GET.get("plot_type", "issues")if not new_cycle_id:return Response(@@ -879,6 +1014,7 @@ class TransferCycleIssueEndpoint(BaseAPIView):queryset=old_cycle.first(),slug=slug,project_id=project_id,+ plot_type=plot_type,cycle_id=cycle_id,)diff --git a/apiserver/plane/app/views/estimate/base.py b/apiserver/plane/app/views/estimate/base.pyindex 7ac3035a95..2bd9e3dfe9 100644--- a/apiserver/plane/app/views/estimate/base.py+++ b/apiserver/plane/app/views/estimate/base.py@@ -1,3 +1,6 @@+import random+import string+# Third party importsfrom rest_framework.response import Responsefrom rest_framework import status@@ -5,7 +8,7 @@ from rest_framework import status# Module importsfrom ..base import BaseViewSet, BaseAPIViewfrom plane.app.permissions import ProjectEntityPermission-from plane.db.models import Project, Estimate, EstimatePoint+from plane.db.models import Project, Estimate, EstimatePoint, Issuefrom plane.app.serializers import (EstimateSerializer,EstimatePointSerializer,@@ -13,6 +16,12 @@ from plane.app.serializers import ()from plane.utils.cache import invalidate_cache++def generate_random_name(length=10):+ letters = string.ascii_lowercase+ return "".join(random.choice(letters) for i in range(length))++class ProjectEstimatePointEndpoint(BaseAPIView):permission_classes = [ProjectEntityPermission,@@ -49,13 +58,17 @@ class BulkEstimatePointEndpoint(BaseViewSet):serializer = EstimateReadSerializer(estimates, many=True)return Response(serializer.data, status=status.HTTP_200_OK)- @invalidate_cache(path="/api/workspaces/:slug/estimates/", url_params=True, user=False)+ @invalidate_cache(+ path="/api/workspaces/:slug/estimates/", url_params=True, user=False+ )def create(self, request, slug, project_id):- if not request.data.get("estimate", False):- return Response(- {"error": "Estimate is required"},- status=status.HTTP_400_BAD_REQUEST,- )+ estimate = request.data.get('estimate')+ estimate_name = estimate.get("name", generate_random_name())+ estimate_type = estimate.get("type", 'categories')+ last_used = estimate.get("last_used", False)+ estimate = Estimate.objects.create(+ name=estimate_name, project_id=project_id, last_used=last_used, type=estimate_type+ )estimate_points = request.data.get("estimate_points", [])@@ -67,14 +80,6 @@ class BulkEstimatePointEndpoint(BaseViewSet):serializer.errors, status=status.HTTP_400_BAD_REQUEST)- estimate_serializer = EstimateSerializer(- data=request.data.get("estimate")- )- if not estimate_serializer.is_valid():- return Response(- estimate_serializer.errors, status=status.HTTP_400_BAD_REQUEST- )- estimate = estimate_serializer.save(project_id=project_id)estimate_points = EstimatePoint.objects.bulk_create([EstimatePoint(@@ -93,17 +98,8 @@ class BulkEstimatePointEndpoint(BaseViewSet):ignore_conflicts=True,)- estimate_point_serializer = EstimatePointSerializer(- estimate_points, many=True- )-- return Response(- {- "estimate": estimate_serializer.data,- "estimate_points": estimate_point_serializer.data,- },- status=status.HTTP_200_OK,- )+ serializer = EstimateReadSerializer(estimate)+ return Response(serializer.data, status=status.HTTP_200_OK)def retrieve(self, request, slug, project_id, estimate_id):estimate = Estimate.objects.get(@@ -115,13 +111,10 @@ class BulkEstimatePointEndpoint(BaseViewSet):status=status.HTTP_200_OK,)- @invalidate_cache(path="/api/workspaces/:slug/estimates/", url_params=True, user=False)+ @invalidate_cache(+ path="/api/workspaces/:slug/estimates/", url_params=True, user=False+ )def partial_update(self, request, slug, project_id, estimate_id):- if not request.data.get("estimate", False):- return Response(- {"error": "Estimate is required"},- status=status.HTTP_400_BAD_REQUEST,- )if not len(request.data.get("estimate_points", [])):return Response(@@ -131,15 +124,10 @@ class BulkEstimatePointEndpoint(BaseViewSet):estimate = Estimate.objects.get(pk=estimate_id)- estimate_serializer = EstimateSerializer(- estimate, data=request.data.get("estimate"), partial=True- )- if not estimate_serializer.is_valid():- return Response(- estimate_serializer.errors, status=status.HTTP_400_BAD_REQUEST- )-- estimate = estimate_serializer.save()+ if request.data.get("estimate"):+ estimate.name = request.data.get("estimate").get("name", estimate.name)+ estimate.type = request.data.get("estimate").get("type", estimate.type)+ estimate.save()estimate_points_data = request.data.get("estimate_points", [])@@ -165,29 +153,113 @@ class BulkEstimatePointEndpoint(BaseViewSet):estimate_point.value = estimate_point_data[0].get("value", estimate_point.value)+ estimate_point.key = estimate_point_data[0].get(+ "key", estimate_point.key+ )updated_estimate_points.append(estimate_point)EstimatePoint.objects.bulk_update(updated_estimate_points,- ["value"],+ ["key", "value"],batch_size=10,)- estimate_point_serializer = EstimatePointSerializer(- estimate_points, many=True- )+ estimate_serializer = EstimateReadSerializer(estimate)return Response(- {- "estimate": estimate_serializer.data,- "estimate_points": estimate_point_serializer.data,- },+ estimate_serializer.data,status=status.HTTP_200_OK,)- @invalidate_cache(path="/api/workspaces/:slug/estimates/", url_params=True, user=False)+ @invalidate_cache(+ path="/api/workspaces/:slug/estimates/", url_params=True, user=False+ )def destroy(self, request, slug, project_id, estimate_id):estimate = Estimate.objects.get(pk=estimate_id, workspace__slug=slug, project_id=project_id)estimate.delete()return Response(status=status.HTTP_204_NO_CONTENT)+++class EstimatePointEndpoint(BaseViewSet):+ permission_classes = [+ ProjectEntityPermission,+ ]++ def create(self, request, slug, project_id, estimate_id):+ # TODO: add a key validation if the same key already exists+ if not request.data.get("key") or not request.data.get("value"):+ return Response(+ {"error": "Key and value are required"},+ status=status.HTTP_400_BAD_REQUEST,+ )+ key = request.data.get("key", 0)+ value = request.data.get("value", "")+ estimate_point = EstimatePoint.objects.create(+ estimate_id=estimate_id,+ project_id=project_id,+ key=key,+ value=value,+ )+ serializer = EstimatePointSerializer(estimate_point).data+ return Response(serializer, status=status.HTTP_200_OK)++ def partial_update(self, request, slug, project_id, estimate_id, estimate_point_id):+ # TODO: add a key validation if the same key already exists+ estimate_point = EstimatePoint.objects.get(+ pk=estimate_point_id,+ estimate_id=estimate_id,+ project_id=project_id,+ workspace__slug=slug,+ )+ serializer = EstimatePointSerializer(+ estimate_point, data=request.data, partial=True+ )+ if not serializer.is_valid():+ return Response(+ serializer.errors, status=status.HTTP_400_BAD_REQUEST+ )+ serializer.save()+ return Response(serializer.data, status=status.HTTP_200_OK)++ def destroy(+ self, request, slug, project_id, estimate_id, estimate_point_id+ ):+ new_estimate_id = request.GET.get("new_estimate_id", None)+ estimate_points = EstimatePoint.objects.filter(+ estimate_id=estimate_id,+ project_id=project_id,+ workspace__slug=slug,+ )+ # update all the issues with the new estimate+ if new_estimate_id:+ _ = Issue.objects.filter(+ project_id=project_id,+ workspace__slug=slug,+ estimate_id=estimate_point_id,+ ).update(estimate_id=new_estimate_id)++ # delete the estimate point+ old_estimate_point = EstimatePoint.objects.filter(+ pk=estimate_point_id+ ).first()++ # rearrange the estimate points+ updated_estimate_points = []+ for estimate_point in estimate_points:+ if estimate_point.key > old_estimate_point.key:+ estimate_point.key -= 1+ updated_estimate_points.append(estimate_point)++ EstimatePoint.objects.bulk_update(+ updated_estimate_points,+ ["key"],+ batch_size=10,+ )++ old_estimate_point.delete()++ return Response(+ EstimatePointSerializer(updated_estimate_points, many=True).data,+ status=status.HTTP_200_OK,+ )diff --git a/apiserver/plane/app/views/module/archive.py b/apiserver/plane/app/views/module/archive.pyindex 2cac5f3669..d474f26c65 100644--- a/apiserver/plane/app/views/module/archive.py+++ b/apiserver/plane/app/views/module/archive.py@@ -165,6 +165,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):)def get(self, request, slug, project_id, pk=None):+ plot_type = request.GET.get("plot_type", "issues")if pk is None:queryset = self.get_queryset()modules = queryset.values( # Required fields@@ -323,6 +324,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):queryset=modules,slug=slug,project_id=project_id,+ plot_type=plot_type,module_id=pk,)diff --git a/apiserver/plane/app/views/module/base.py b/apiserver/plane/app/views/module/base.pyindex 56267554d7..5b631be463 100644--- a/apiserver/plane/app/views/module/base.py+++ b/apiserver/plane/app/views/module/base.py@@ -16,8 +16,9 @@ from django.db.models import (Subquery,UUIDField,Value,+ Sum,)-from django.db.models.functions import Coalesce+from django.db.models.functions import Coalesce, Castfrom django.core.serializers.json import DjangoJSONEncoderfrom django.utils import timezone@@ -128,6 +129,34 @@ class ModuleViewSet(BaseViewSet):.annotate(cnt=Count("pk")).values("cnt"))+ completed_estimate_point = (+ Issue.issue_objects.filter(+ estimate_point__estimate__type="points",+ state__group="completed",+ issue_module__module_id=OuterRef("pk"),+ )+ .values("issue_module__module_id")+ .annotate(+ completed_estimate_points=Sum(+ Cast("estimate_point__value", IntegerField())+ )+ )+ .values("completed_estimate_points")[:1]+ )++ total_estimate_point = (+ Issue.issue_objects.filter(+ estimate_point__estimate__type="points",+ issue_module__module_id=OuterRef("pk"),+ )+ .values("issue_module__module_id")+ .annotate(+ total_estimate_points=Sum(+ Cast("estimate_point__value", IntegerField())+ )+ )+ .values("total_estimate_points")[:1]+ )return (super().get_queryset()@@ -182,6 +211,18 @@ class ModuleViewSet(BaseViewSet):Value(0, output_field=IntegerField()),))+ .annotate(+ completed_estimate_points=Coalesce(+ Subquery(completed_estimate_point),+ Value(0, output_field=IntegerField()),+ ),+ )+ .annotate(+ total_estimate_points=Coalesce(+ Subquery(total_estimate_point),+ Value(0, output_field=IntegerField()),+ ),+ ).annotate(member_ids=Coalesce(ArrayAgg(@@ -233,6 +274,8 @@ class ModuleViewSet(BaseViewSet):"total_issues","started_issues","unstarted_issues",+ "completed_estimate_points",+ "total_estimate_points","backlog_issues","created_at","updated_at",@@ -284,6 +327,8 @@ class ModuleViewSet(BaseViewSet):"external_id","logo_props",# computed fields+ "completed_estimate_points",+ "total_estimate_points","total_issues","is_favorite","cancelled_issues",@@ -301,6 +346,7 @@ class ModuleViewSet(BaseViewSet):return Response(modules, status=status.HTTP_200_OK)def retrieve(self, request, slug, project_id, pk):+ plot_type = request.GET.get("plot_type", "burndown")queryset = (self.get_queryset().filter(archived_at__isnull=True)@@ -423,6 +469,7 @@ class ModuleViewSet(BaseViewSet):queryset=modules,slug=slug,project_id=project_id,+ plot_type=plot_type,module_id=pk,)@@ -469,6 +516,8 @@ class ModuleViewSet(BaseViewSet):"external_id","logo_props",# computed fields+ "completed_estimate_points",+ "total_estimate_points","is_favorite","cancelled_issues","completed_issues",diff --git a/apiserver/plane/app/views/project/base.py b/apiserver/plane/app/views/project/base.pyindex 39db11871d..7e3326e02c 100644--- a/apiserver/plane/app/views/project/base.py+++ b/apiserver/plane/app/views/project/base.py@@ -28,7 +28,7 @@ from plane.app.views.base import BaseViewSet, BaseAPIViewfrom plane.app.serializers import (ProjectSerializer,ProjectListSerializer,- ProjectDeployBoardSerializer,+ DeployBoardSerializer,)from plane.app.permissions import (@@ -46,7 +46,7 @@ from plane.db.models import (Module,Cycle,Inbox,- ProjectDeployBoard,+ DeployBoard,IssueProperty,Issue,)@@ -137,12 +137,11 @@ class ProjectViewSet(BaseViewSet):).values("role")).annotate(- is_deployed=Exists(- ProjectDeployBoard.objects.filter(- project_id=OuterRef("pk"),- workspace__slug=self.kwargs.get("slug"),- )- )+ anchor=DeployBoard.objects.filter(+ entity_name="project",+ entity_identifier=OuterRef("pk"),+ workspace__slug=self.kwargs.get("slug"),+ ).values("anchor")).annotate(sort_order=Subquery(sort_order)).prefetch_related(@@ -639,29 +638,28 @@ class ProjectPublicCoverImagesEndpoint(BaseAPIView):return Response(files, status=status.HTTP_200_OK)-class ProjectDeployBoardViewSet(BaseViewSet):+class DeployBoardViewSet(BaseViewSet):permission_classes = [ProjectMemberPermission,]- serializer_class = ProjectDeployBoardSerializer- model = ProjectDeployBoard+ serializer_class = DeployBoardSerializer+ model = DeployBoard- def get_queryset(self):- return (- super()- .get_queryset()- .filter(- workspace__slug=self.kwargs.get("slug"),- project_id=self.kwargs.get("project_id"),- )- .select_related("project")- )+ def list(self, request, slug, project_id):+ project_deploy_board = DeployBoard.objects.filter(+ entity_name="project",+ entity_identifier=project_id,+ workspace__slug=slug,+ ).first()++ serializer = DeployBoardSerializer(project_deploy_board)+ return Response(serializer.data, status=status.HTTP_200_OK)def create(self, request, slug, project_id):- comments = request.data.get("comments", False)- reactions = request.data.get("reactions", False)+ comments = request.data.get("is_comments_enabled", False)+ reactions = request.data.get("is_reactions_enabled", False)inbox = request.data.get("inbox", None)- votes = request.data.get("votes", False)+ votes = request.data.get("is_votes_enabled", False)views = request.data.get("views",{@@ -673,17 +671,18 @@ class ProjectDeployBoardViewSet(BaseViewSet):},)- project_deploy_board, _ = ProjectDeployBoard.objects.get_or_create(- anchor=f"{slug}/{project_id}",+ project_deploy_board, _ = DeployBoard.objects.get_or_create(+ entity_name="project",+ entity_identifier=project_id,project_id=project_id,)- project_deploy_board.comments = comments- project_deploy_board.reactions = reactionsproject_deploy_board.inbox = inbox- project_deploy_board.votes = votes- project_deploy_board.views = views+ project_deploy_board.view_props = views+ project_deploy_board.is_votes_enabled = votes+ project_deploy_board.is_comments_enabled = comments+ project_deploy_board.is_reactions_enabled = reactionsproject_deploy_board.save()- serializer = ProjectDeployBoardSerializer(project_deploy_board)+ serializer = DeployBoardSerializer(project_deploy_board)return Response(serializer.data, status=status.HTTP_200_OK)diff --git a/apiserver/plane/bgtasks/issue_activites_task.py b/apiserver/plane/bgtasks/issue_activites_task.pyindex 007b3e48c9..67cda14af6 100644--- a/apiserver/plane/bgtasks/issue_activites_task.py+++ b/apiserver/plane/bgtasks/issue_activites_task.py@@ -28,6 +28,7 @@ from plane.db.models import (Project,State,User,+ EstimatePoint,)from plane.settings.redis import redis_instancefrom plane.utils.exception_logger import log_exception@@ -448,21 +449,37 @@ def track_estimate_points(if current_instance.get("estimate_point") != requested_data.get("estimate_point"):+ old_estimate = (+ EstimatePoint.objects.filter(+ pk=current_instance.get("estimate_point")+ ).first()+ if current_instance.get("estimate_point") is not None+ else None+ )+ new_estimate = (+ EstimatePoint.objects.filter(+ pk=requested_data.get("estimate_point")+ ).first()+ if requested_data.get("estimate_point") is not None+ else None+ )issue_activities.append(IssueActivity(issue_id=issue_id,actor_id=actor_id,verb="updated",- old_value=(+ old_identifier=(current_instance.get("estimate_point")if current_instance.get("estimate_point") is not None- else ""+ else None),- new_value=(+ new_identifier=(requested_data.get("estimate_point")if requested_data.get("estimate_point") is not None- else ""+ else None),+ old_value=old_estimate.value if old_estimate else None,+ new_value=new_estimate.value if new_estimate else None,field="estimate_point",project_id=project_id,workspace_id=workspace_id,diff --git a/apiserver/plane/db/migrations/0067_issue_estimate.py b/apiserver/plane/db/migrations/0067_issue_estimate.pynew file mode 100644index 0000000000..b341f98640--- /dev/null+++ b/apiserver/plane/db/migrations/0067_issue_estimate.py@@ -0,0 +1,260 @@+# # Generated by Django 4.2.7 on 2024-05-24 09:47+# Python imports+import uuid+from uuid import uuid4+import django.db.models.deletion+from django.conf import settings+from django.db import migrations, models+import plane.db.models.deploy_board+++def issue_estimate_point(apps, schema_editor):+ Issue = apps.get_model("db", "Issue")+ Project = apps.get_model("db", "Project")+ EstimatePoint = apps.get_model("db", "EstimatePoint")+ IssueActivity = apps.get_model("db", "IssueActivity")+ updated_estimate_point = []+ updated_issue_activity = []++ # loop through all the projects+ for project in Project.objects.filter(estimate__isnull=False):+ estimate_points = EstimatePoint.objects.filter(+ estimate=project.estimate, project=project+ )++ for issue_activity in IssueActivity.objects.filter(+ field="estimate_point", project=project+ ):+ if issue_activity.new_value:+ new_identifier = estimate_points.filter(+ key=issue_activity.new_value+ ).first().id+ issue_activity.new_identifier = new_identifier+ new_value = estimate_points.filter(+ key=issue_activity.new_value+ ).first().value+ issue_activity.new_value = new_value++ if issue_activity.old_value:+ old_identifier = estimate_points.filter(+ key=issue_activity.old_value+ ).first().id+ issue_activity.old_identifier = old_identifier+ old_value = estimate_points.filter(+ key=issue_activity.old_value+ ).first().value+ issue_activity.old_value = old_value+ updated_issue_activity.append(issue_activity)++ for issue in Issue.objects.filter(+ point__isnull=False, project=project+ ):+ # get the estimate id for the corresponding estimate point in the issue+ estimate = estimate_points.filter(key=issue.point).first()+ issue.estimate_point = estimate+ updated_estimate_point.append(issue)++ Issue.objects.bulk_update(+ updated_estimate_point, ["estimate_point"], batch_size=1000+ )+ IssueActivity.objects.bulk_update(+ updated_issue_activity,+ ["new_value", "old_value", "new_identifier", "old_identifier"],+ batch_size=1000,+ )+++def last_used_estimate(apps, schema_editor):+ Project = apps.get_model("db", "Project")+ Estimate = apps.get_model("db", "Estimate")++ # Get all estimate ids used in projects+ estimate_ids = Project.objects.filter(estimate__isnull=False).values_list(+ "estimate", flat=True+ )++ # Update all matching estimates+ Estimate.objects.filter(id__in=estimate_ids).update(last_used=True)+++def populate_deploy_board(apps, schema_editor):+ DeployBoard = apps.get_model("db", "DeployBoard")+ ProjectDeployBoard = apps.get_model("db", "ProjectDeployBoard")++ DeployBoard.objects.bulk_create(+ [+ DeployBoard(+ entity_identifier=deploy_board.project_id,+ project_id=deploy_board.project_id,+ entity_name="project",+ anchor=uuid4().hex,+ is_comments_enabled=deploy_board.comments,+ is_reactions_enabled=deploy_board.reactions,+ inbox=deploy_board.inbox,+ is_votes_enabled=deploy_board.votes,+ view_props=deploy_board.views,+ workspace_id=deploy_board.workspace_id,+ created_at=deploy_board.created_at,+ updated_at=deploy_board.updated_at,+ created_by_id=deploy_board.created_by_id,+ updated_by_id=deploy_board.updated_by_id,+ )+ for deploy_board in ProjectDeployBoard.objects.all()+ ],+ batch_size=100,+ )+++class Migration(migrations.Migration):++ dependencies = [+ ("db", "0066_account_id_token_cycle_logo_props_module_logo_props"),+ ]++ operations = [+ migrations.CreateModel(+ name="DeployBoard",+ fields=[+ (+ "created_at",+ models.DateTimeField(+ auto_now_add=True, verbose_name="Created At"+ ),+ ),+ (+ "updated_at",+ models.DateTimeField(+ auto_now=True, verbose_name="Last Modified At"+ ),+ ),+ (+ "id",+ models.UUIDField(+ db_index=True,+ default=uuid.uuid4,+ editable=False,+ primary_key=True,+ serialize=False,+ unique=True,+ ),+ ),+ ("entity_identifier", models.UUIDField(null=True)),+ (+ "entity_name",+ models.CharField(+ choices=[+ ("project", "Project"),+ ("issue", "Issue"),+ ("module", "Module"),+ ("cycle", "Task"),+ ("page", "Page"),+ ("view", "View"),+ ],+ max_length=30,+ ),+ ),+ (+ "anchor",+ models.CharField(+ db_index=True,+ default=plane.db.models.deploy_board.get_anchor,+ max_length=255,+ unique=True,+ ),+ ),+ ("is_comments_enabled", models.BooleanField(default=False)),+ ("is_reactions_enabled", models.BooleanField(default=False)),+ ("is_votes_enabled", models.BooleanField(default=False)),+ ("view_props", models.JSONField(default=dict)),+ (+ "created_by",+ models.ForeignKey(+ null=True,+ on_delete=django.db.models.deletion.SET_NULL,+ related_name="%(class)s_created_by",+ to=settings.AUTH_USER_MODEL,+ verbose_name="Created By",+ ),+ ),+ (+ "inbox",+ models.ForeignKey(+ null=True,+ on_delete=django.db.models.deletion.SET_NULL,+ related_name="board_inbox",+ to="db.inbox",+ ),+ ),+ (+ "project",+ models.ForeignKey(+ null=True,+ on_delete=django.db.models.deletion.CASCADE,+ related_name="project_%(class)s",+ to="db.project",+ ),+ ),+ (+ "updated_by",+ models.ForeignKey(+ null=True,+ on_delete=django.db.models.deletion.SET_NULL,+ related_name="%(class)s_updated_by",+ to=settings.AUTH_USER_MODEL,+ verbose_name="Last Modified By",+ ),+ ),+ (+ "workspace",+ models.ForeignKey(+ on_delete=django.db.models.deletion.CASCADE,+ related_name="workspace_%(class)s",+ to="db.workspace",+ ),+ ),+ ],+ options={+ "verbose_name": "Deploy Board",+ "verbose_name_plural": "Deploy Boards",+ "db_table": "deploy_boards",+ "ordering": ("-created_at",),+ "unique_together": {("entity_name", "entity_identifier")},+ },+ ),+ migrations.AddField(+ model_name="estimate",+ name="last_used",+ field=models.BooleanField(default=False),+ ),+ # Rename the existing field+ migrations.RenameField(+ model_name="issue",+ old_name="estimate_point",+ new_name="point",+ ),+ # Add a new field with the original name as a foreign key+ migrations.AddField(+ model_name="issue",+ name="estimate_point",+ field=models.ForeignKey(+ on_delete=django.db.models.deletion.SET_NULL,+ related_name="issue_estimates",+ to="db.EstimatePoint",+ blank=True,+ null=True,+ ),+ ),+ migrations.AlterField(+ model_name="estimate",+ name="type",+ field=models.CharField(default="categories", max_length=255),+ ),+ migrations.AlterField(+ model_name="estimatepoint",+ name="value",+ field=models.CharField(max_length=255),+ ),+ migrations.RunPython(issue_estimate_point),+ migrations.RunPython(last_used_estimate),+ migrations.RunPython(populate_deploy_board),+ ]diff --git a/apiserver/plane/db/models/__init__.py b/apiserver/plane/db/models/__init__.pyindex b11ce7aa35..51b0e70e5a 100644--- a/apiserver/plane/db/models/__init__.py+++ b/apiserver/plane/db/models/__init__.py@@ -4,6 +4,7 @@ from .asset import FileAssetfrom .base import BaseModelfrom .cycle import Cycle, CycleFavorite, CycleIssue, CycleUserPropertiesfrom .dashboard import Dashboard, DashboardWidget, Widget+from .deploy_board import DeployBoardfrom .estimate import Estimate, EstimatePointfrom .exporter import ExporterHistoryfrom .importer import Importer@@ -53,13 +54,13 @@ from .page import Page, PageFavorite, PageLabel, PageLogfrom .project import (Project,ProjectBaseModel,- ProjectDeployBoard,ProjectFavorite,ProjectIdentifier,ProjectMember,ProjectMemberInvite,ProjectPublicMember,)+from .deploy_board import DeployBoardfrom .session import Sessionfrom .social_connection import SocialLoginConnectionfrom .state import Statediff --git a/apiserver/plane/db/models/deploy_board.py b/apiserver/plane/db/models/deploy_board.pynew file mode 100644index 0000000000..41ffbc7c17--- /dev/null+++ b/apiserver/plane/db/models/deploy_board.py@@ -0,0 +1,53 @@+# Python imports+from uuid import uuid4++# Django imports+from django.db import models++# Module imports+from .workspace import WorkspaceBaseModel+++def get_anchor():+ return uuid4().hex+++class DeployBoard(WorkspaceBaseModel):+ TYPE_CHOICES = (+ ("project", "Project"),+ ("issue", "Issue"),+ ("module", "Module"),+ ("cycle", "Task"),+ ("page", "Page"),+ ("view", "View"),+ )++ entity_identifier = models.UUIDField(null=True)+ entity_name = models.CharField(+ max_length=30,+ choices=TYPE_CHOICES,+ )+ anchor = models.CharField(+ max_length=255, default=get_anchor, unique=True, db_index=True+ )+ is_comments_enabled = models.BooleanField(default=False)+ is_reactions_enabled = models.BooleanField(default=False)+ inbox = models.ForeignKey(+ "db.Inbox",+ related_name="board_inbox",+ on_delete=models.SET_NULL,+ null=True,+ )+ is_votes_enabled = models.BooleanField(default=False)+ view_props = models.JSONField(default=dict)++ def __str__(self):+ """Return name of the deploy board"""+ return f"{self.entity_identifier} <{self.entity_name}>"++ class Meta:+ unique_together = ["entity_name", "entity_identifier"]+ verbose_name = "Deploy Board"+ verbose_name_plural = "Deploy Boards"+ db_table = "deploy_boards"+ ordering = ("-created_at",)diff --git a/apiserver/plane/db/models/estimate.py b/apiserver/plane/db/models/estimate.pyindex 6ff1186c3d..0713d774fa 100644--- a/apiserver/plane/db/models/estimate.py+++ b/apiserver/plane/db/models/estimate.py@@ -11,7 +11,8 @@ class Estimate(ProjectBaseModel):description = models.TextField(verbose_name="Estimate Description", blank=True)- type = models.CharField(max_length=255, default="Categories")+ type = models.CharField(max_length=255, default="categories")+ last_used = models.BooleanField(default=False)def __str__(self):"""Return name of the estimate"""@@ -35,7 +36,7 @@ class EstimatePoint(ProjectBaseModel):default=0, validators=[MinValueValidator(0), MaxValueValidator(12)])description = models.TextField(blank=True)- value = models.CharField(max_length=20)+ value = models.CharField(max_length=255)def __str__(self):"""Return name of the estimate"""diff --git a/apiserver/plane/db/models/issue.py b/apiserver/plane/db/models/issue.pyindex 527597ddc3..2b07bd77b6 100644--- a/apiserver/plane/db/models/issue.py+++ b/apiserver/plane/db/models/issue.py@@ -119,11 +119,18 @@ class Issue(ProjectBaseModel):blank=True,related_name="state_issue",)- estimate_point = models.IntegerField(+ point = models.IntegerField(validators=[MinValueValidator(0), MaxValueValidator(12)],null=True,blank=True,)+ estimate_point = models.ForeignKey(+ "db.EstimatePoint",+ on_delete=models.SET_NULL,+ related_name="issue_estimates",+ null=True,+ blank=True,+ )name = models.CharField(max_length=255, verbose_name="Issue Name")description = models.JSONField(blank=True, default=dict)description_html = models.TextField(blank=True, default="<p></p>")diff --git a/apiserver/plane/db/models/project.py b/apiserver/plane/db/models/project.pyindex 49fca1323e..ba8dbf580f 100644--- a/apiserver/plane/db/models/project.py+++ b/apiserver/plane/db/models/project.py@@ -260,6 +260,8 @@ def get_default_views():}+# DEPRECATED TODO:+# used to get the old anchors for the project deploy boardsclass ProjectDeployBoard(ProjectBaseModel):anchor = models.CharField(max_length=255, default=get_anchor, unique=True, db_index=Truediff --git a/apiserver/plane/space/urls/inbox.py b/apiserver/plane/space/urls/inbox.pyindex 60de040e24..20ebb34376 100644--- a/apiserver/plane/space/urls/inbox.py+++ b/apiserver/plane/space/urls/inbox.py@@ -10,7 +10,7 @@ from plane.space.views import (urlpatterns = [path(- "workspaces/<str:slug>/project-boards/<uuid:project_id>/inboxes/<uuid:inbox_id>/inbox-issues/",+ "anchor/<str:anchor>/inboxes/<uuid:inbox_id>/inbox-issues/",InboxIssuePublicViewSet.as_view({"get": "list",@@ -20,7 +20,7 @@ urlpatterns = [name="inbox-issue",),path(- "workspaces/<str:slug>/project-boards/<uuid:project_id>/inboxes/<uuid:inbox_id>/inbox-issues/<uuid:pk>/",+ "anchor/<str:anchor>/inboxes/<uuid:inbox_id>/inbox-issues/<uuid:pk>/",InboxIssuePublicViewSet.as_view({"get": "retrieve",@@ -31,7 +31,7 @@ urlpatterns = [name="inbox-issue",),path(- "workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/votes/",+ "anchor/<str:anchor>/issues/<uuid:issue_id>/votes/",IssueVotePublicViewSet.as_view({"get": "list",diff --git a/apiserver/plane/space/urls/issue.py b/apiserver/plane/space/urls/issue.pyindex 099eace5d2..61c19ba016 100644--- a/apiserver/plane/space/urls/issue.py+++ b/apiserver/plane/space/urls/issue.py@@ -10,12 +10,12 @@ from plane.space.views import (urlpatterns = [path(- "workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/",+ "anchor/<str:anchor>/issues/<uuid:issue_id>/",IssueRetrievePublicEndpoint.as_view(),name="workspace-project-boards",),path(- "workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/comments/",+ "anchor/<str:anchor>/issues/<uuid:issue_id>/comments/",IssueCommentPublicViewSet.as_view({"get": "list",@@ -25,7 +25,7 @@ urlpatterns = [name="issue-comments-project-board",),path(- "workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/comments/<uuid:pk>/",+ "anchor/<str:anchor>/issues/<uuid:issue_id>/comments/<uuid:pk>/",IssueCommentPublicViewSet.as_view({"get": "retrieve",@@ -36,7 +36,7 @@ urlpatterns = [name="issue-comments-project-board",),path(- "workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/reactions/",+ "anchor/<str:anchor>/issues/<uuid:issue_id>/reactions/",IssueReactionPublicViewSet.as_view({"get": "list",@@ -46,7 +46,7 @@ urlpatterns = [name="issue-reactions-project-board",),path(- "workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/reactions/<str:reaction_code>/",+ "anchor/<str:anchor>/issues/<uuid:issue_id>/reactions/<str:reaction_code>/",IssueReactionPublicViewSet.as_view({"delete": "destroy",@@ -55,7 +55,7 @@ urlpatterns = [name="issue-reactions-project-board",),path(- "workspaces/<str:slug>/project-boards/<uuid:project_id>/comments/<uuid:comment_id>/reactions/",+ "anchor/<str:anchor>/comments/<uuid:comment_id>/reactions/",CommentReactionPublicViewSet.as_view({"get": "list",@@ -65,7 +65,7 @@ urlpatterns = [name="comment-reactions-project-board",),path(- "workspaces/<str:slug>/project-boards/<uuid:project_id>/comments/<uuid:comment_id>/reactions/<str:reaction_code>/",+ "anchor/<str:anchor>/comments/<uuid:comment_id>/reactions/<str:reaction_code>/",CommentReactionPublicViewSet.as_view({"delete": "destroy",diff --git a/apiserver/plane/space/urls/project.py b/apiserver/plane/space/urls/project.pyindex dc97b43a79..3294b01f64 100644--- a/apiserver/plane/space/urls/project.py+++ b/apiserver/plane/space/urls/project.py@@ -4,17 +4,23 @@ from django.urls import pathfrom plane.space.views import (ProjectDeployBoardPublicSettingsEndpoint,ProjectIssuesPublicEndpoint,+ WorkspaceProjectAnchorEndpoint,)urlpatterns = [path(- "workspaces/<str:slug>/project-boards/<uuid:project_id>/settings/",+ "anchor/<str:anchor>/settings/",ProjectDeployBoardPublicSettingsEndpoint.as_view(),name="project-deploy-board-settings",),path(- "workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/",+ "anchor/<str:anchor>/issues/",ProjectIssuesPublicEndpoint.as_view(),name="project-deploy-board",),+ path(+ "workspaces/<str:slug>/projects/<uuid:project_id>/anchor/",+ WorkspaceProjectAnchorEndpoint.as_view(),+ name="project-deploy-board",+ ),]diff --git a/apiserver/plane/space/views/__init__.py b/apiserver/plane/space/views/__init__.pyindex 5130e04d5e..eced7d1b46 100644--- a/apiserver/plane/space/views/__init__.py+++ b/apiserver/plane/space/views/__init__.py@@ -1,6 +1,7 @@from .project import (ProjectDeployBoardPublicSettingsEndpoint,WorkspaceProjectDeployBoardEndpoint,+ WorkspaceProjectAnchorEndpoint,)from .issue import (diff --git a/apiserver/plane/space/views/inbox.py b/apiserver/plane/space/views/inbox.pyindex 9f681c1609..b89c77672c 100644--- a/apiserver/plane/space/views/inbox.py+++ b/apiserver/plane/space/views/inbox.py@@ -18,7 +18,7 @@ from plane.db.models import (State,IssueLink,IssueAttachment,- ProjectDeployBoard,+ DeployBoard,)from plane.app.serializers import (IssueSerializer,@@ -39,7 +39,7 @@ class InboxIssuePublicViewSet(BaseViewSet):]def get_queryset(self):- project_deploy_board = ProjectDeployBoard.objects.get(+ project_deploy_board = DeployBoard.objects.get(workspace__slug=self.kwargs.get("slug"),project_id=self.kwargs.get("project_id"),)@@ -58,9 +58,9 @@ class InboxIssuePublicViewSet(BaseViewSet):)return InboxIssue.objects.none()- def list(self, request, slug, project_id, inbox_id):- project_deploy_board = ProjectDeployBoard.objects.get(- workspace__slug=slug, project_id=project_id+ def list(self, request, anchor, inbox_id):+ project_deploy_board = DeployBoard.objects.get(+ anchor=anchor, entity_name="project")if project_deploy_board.inbox is None:return Response(@@ -72,8 +72,8 @@ class InboxIssuePublicViewSet(BaseViewSet):issues = (Issue.objects.filter(issue_inbox__inbox_id=inbox_id,- workspace__slug=slug,- project_id=project_id,+ workspace_id=project_deploy_board.workspace_id,+ project_id=project_deploy_board.project_id,).filter(**filters).annotate(bridge_id=F("issue_inbox__id"))@@ -117,9 +117,9 @@ class InboxIssuePublicViewSet(BaseViewSet):status=status.HTTP_200_OK,)- def create(self, request, slug, project_id, inbox_id):- project_deploy_board = ProjectDeployBoard.objects.get(- workspace__slug=slug, project_id=project_id+ def create(self, request, anchor, inbox_id):+ project_deploy_board = DeployBoard.objects.get(+ anchor=anchor, entity_name="project")if project_deploy_board.inbox is None:return Response(@@ -151,7 +151,7 @@ class InboxIssuePublicViewSet(BaseViewSet):name="Triage",group="backlog",description="Default state for managing all Inbox Issues",- project_id=project_id,+ project_id=project_deploy_board.project_id,color="#ff7700",)@@ -163,7 +163,7 @@ class InboxIssuePublicViewSet(BaseViewSet):"description_html", "<p></p>"),priority=request.data.get("issue", {}).get("priority", "low"),- project_id=project_id,+ project_id=project_deploy_board.project_id,state=state,)@@ -173,14 +173,14 @@ class InboxIssuePublicViewSet(BaseViewSet):requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),actor_id=str(request.user.id),issue_id=str(issue.id),- project_id=str(project_id),+ project_id=str(project_deploy_board.project_id),current_instance=None,epoch=int(timezone.now().timestamp()),)# create an inbox issueInboxIssue.objects.create(inbox_id=inbox_id,- project_id=project_id,+ project_id=project_deploy_board.project_id,issue=issue,source=request.data.get("source", "in-app"),)@@ -188,9 +188,9 @@ class InboxIssuePublicViewSet(BaseViewSet):serializer = IssueStateInboxSerializer(issue)return Response(serializer.data, status=status.HTTP_200_OK)- def partial_update(self, request, slug, project_id, inbox_id, pk):- project_deploy_board = ProjectDeployBoard.objects.get(- workspace__slug=slug, project_id=project_id+ def partial_update(self, request, anchor, inbox_id, pk):+ project_deploy_board = DeployBoard.objects.get(+ anchor=anchor, entity_name="project")if project_deploy_board.inbox is None:return Response(@@ -200,8 +200,8 @@ class InboxIssuePublicViewSet(BaseViewSet):inbox_issue = InboxIssue.objects.get(pk=pk,- workspace__slug=slug,- project_id=project_id,+ workspace_id=project_deploy_board.workspace_id,+ project_id=project_deploy_board.project_id,inbox_id=inbox_id,)# Get the project member@@ -216,8 +216,8 @@ class InboxIssuePublicViewSet(BaseViewSet):issue = Issue.objects.get(pk=inbox_issue.issue_id,- workspace__slug=slug,- project_id=project_id,+ workspace_id=project_deploy_board.workspace_id,+ project_id=project_deploy_board.project_id,)# viewers and guests since only viewers and guestsissue_data = {@@ -242,7 +242,7 @@ class InboxIssuePublicViewSet(BaseViewSet):requested_data=requested_data,actor_id=str(request.user.id),issue_id=str(issue.id),- project_id=str(project_id),+ project_id=str(project_deploy_board.project_id),current_instance=json.dumps(IssueSerializer(current_instance).data,cls=DjangoJSONEncoder,@@ -255,9 +255,9 @@ class InboxIssuePublicViewSet(BaseViewSet):issue_serializer.errors, status=status.HTTP_400_BAD_REQUEST)- def retrieve(self, request, slug, project_id, inbox_id, pk):- project_deploy_board = ProjectDeployBoard.objects.get(- workspace__slug=slug, project_id=project_id+ def retrieve(self, request, anchor, inbox_id, pk):+ project_deploy_board = DeployBoard.objects.get(+ anchor=anchor, entity_name="project")if project_deploy_board.inbox is None:return Response(@@ -267,21 +267,21 @@ class InboxIssuePublicViewSet(BaseViewSet):inbox_issue = InboxIssue.objects.get(pk=pk,- workspace__slug=slug,- project_id=project_id,+ workspace_id=project_deploy_board.workspace_id,+ project_id=project_deploy_board.project_id,inbox_id=inbox_id,)issue = Issue.objects.get(pk=inbox_issue.issue_id,- workspace__slug=slug,- project_id=project_id,+ workspace_id=project_deploy_board.workspace_id,+ project_id=project_deploy_board.project_id,)serializer = IssueStateInboxSerializer(issue)return Response(serializer.data, status=status.HTTP_200_OK)- def destroy(self, request, slug, project_id, inbox_id, pk):- project_deploy_board = ProjectDeployBoard.objects.get(- workspace__slug=slug, project_id=project_id+ def destroy(self, request, anchor, inbox_id, pk):+ project_deploy_board = DeployBoard.objects.get(+ anchor=anchor, entity_name="project")if project_deploy_board.inbox is None:return Response(@@ -291,8 +291,8 @@ class InboxIssuePublicViewSet(BaseViewSet):inbox_issue = InboxIssue.objects.get(pk=pk,- workspace__slug=slug,- project_id=project_id,+ workspace_id=project_deploy_board.workspace_id,+ project_id=project_deploy_board.project_id,inbox_id=inbox_id,)diff --git a/apiserver/plane/space/views/issue.py b/apiserver/plane/space/views/issue.pyindex 8c4d6e1501..71ba0f6a70 100644--- a/apiserver/plane/space/views/issue.py+++ b/apiserver/plane/space/views/issue.py@@ -44,7 +44,7 @@ from plane.db.models import (ProjectMember,IssueReaction,CommentReaction,- ProjectDeployBoard,+ DeployBoard,IssueVote,ProjectPublicMember,)@@ -76,15 +76,15 @@ class IssueCommentPublicViewSet(BaseViewSet):def get_queryset(self):try:- project_deploy_board = ProjectDeployBoard.objects.get(- workspace__slug=self.kwargs.get("slug"),- project_id=self.kwargs.get("project_id"),+ project_deploy_board = DeployBoard.objects.get(+ anchor=self.kwargs.get("anchor"),+ entity_name="project",)- if project_deploy_board.comments:+ if project_deploy_board.is_comments_enabled:return self.filter_queryset(super().get_queryset()- .filter(workspace__slug=self.kwargs.get("slug"))+ .filter(workspace_id=project_deploy_board.workspace_id).filter(issue_id=self.kwargs.get("issue_id")).filter(access="EXTERNAL").select_related("project")@@ -93,8 +93,8 @@ class IssueCommentPublicViewSet(BaseViewSet):.annotate(is_member=Exists(ProjectMember.objects.filter(- workspace__slug=self.kwargs.get("slug"),- project_id=self.kwargs.get("project_id"),+ workspace_id=project_deploy_board.workspace_id,+ project_id=project_deploy_board.project_id,member_id=self.request.user.id,is_active=True,)@@ -103,15 +103,15 @@ class IssueCommentPublicViewSet(BaseViewSet):.distinct()).order_by("created_at")return IssueComment.objects.none()- except ProjectDeployBoard.DoesNotExist:+ except DeployBoard.DoesNotExist:return IssueComment.objects.none()- def create(self, request, slug, project_id, issue_id):- project_deploy_board = ProjectDeployBoard.objects.get(- workspace__slug=slug, project_id=project_id+ def create(self, request, anchor, issue_id):+ project_deploy_board = DeployBoard.objects.get(+ anchor=anchor, entity_name="project")- if not project_deploy_board.comments:+ if not project_deploy_board.is_comments_enabled:return Response({"error": "Comments are not enabled for this project"},status=status.HTTP_400_BAD_REQUEST,@@ -120,7 +120,7 @@ class IssueCommentPublicViewSet(BaseViewSet):serializer = IssueCommentSerializer(data=request.data)if serializer.is_valid():serializer.save(- project_id=project_id,+ project_id=project_deploy_board.project_id,issue_id=issue_id,actor=request.user,access="EXTERNAL",@@ -132,37 +132,35 @@ class IssueCommentPublicViewSet(BaseViewSet):),actor_id=str(request.user.id),issue_id=str(issue_id),- project_id=str(project_id),+ project_id=str(project_deploy_board.project_id),current_instance=None,epoch=int(timezone.now().timestamp()),)if not ProjectMember.objects.filter(- project_id=project_id,+ project_id=project_deploy_board.project_id,member=request.user,is_active=True,).exists():# Add the user for workspace tracking_ = ProjectPublicMember.objects.get_or_create(- project_id=project_id,+ project_id=project_deploy_board.project_id,member=request.user,)return Response(serializer.data, status=status.HTTP_201_CREATED)return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)- def partial_update(self, request, slug, project_id, issue_id, pk):- project_deploy_board = ProjectDeployBoard.objects.get(- workspace__slug=slug, project_id=project_id+ def partial_update(self, request, anchor, issue_id, pk):+ project_deploy_board = DeployBoard.objects.get(+ anchor=anchor, entity_name="project")- if not project_deploy_board.comments:+ if not project_deploy_board.is_comments_enabled:return Response({"error": "Comments are not enabled for this project"},status=status.HTTP_400_BAD_REQUEST,)- comment = IssueComment.objects.get(- workspace__slug=slug, pk=pk, actor=request.user- )+ comment = IssueComment.objects.get(pk=pk, actor=request.user)serializer = IssueCommentSerializer(comment, data=request.data, partial=True)@@ -173,7 +171,7 @@ class IssueCommentPublicViewSet(BaseViewSet):requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),actor_id=str(request.user.id),issue_id=str(issue_id),- project_id=str(project_id),+ project_id=str(project_deploy_board.project_id),current_instance=json.dumps(IssueCommentSerializer(comment).data,cls=DjangoJSONEncoder,@@ -183,20 +181,18 @@ class IssueCommentPublicViewSet(BaseViewSet):return Response(serializer.data, status=status.HTTP_200_OK)return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)- def destroy(self, request, slug, project_id, issue_id, pk):- project_deploy_board = ProjectDeployBoard.objects.get(- workspace__slug=slug, project_id=project_id+ def destroy(self, request, anchor, issue_id, pk):+ project_deploy_board = DeployBoard.objects.get(+ anchor=anchor, entity_name="project")- if not project_deploy_board.comments:+ if not project_deploy_board.is_comments_enabled:return Response({"error": "Comments are not enabled for this project"},status=status.HTTP_400_BAD_REQUEST,)comment = IssueComment.objects.get(- workspace__slug=slug,pk=pk,- project_id=project_id,actor=request.user,)issue_activity.delay(@@ -204,7 +200,7 @@ class IssueCommentPublicViewSet(BaseViewSet):requested_data=json.dumps({"comment_id": str(pk)}),actor_id=str(request.user.id),issue_id=str(issue_id),- project_id=str(project_id),+ project_id=str(project_deploy_board.project_id),current_instance=json.dumps(IssueCommentSerializer(comment).data,cls=DjangoJSONEncoder,@@ -221,11 +217,11 @@ class IssueReactionPublicViewSet(BaseViewSet):def get_queryset(self):try:- project_deploy_board = ProjectDeployBoard.objects.get(+ project_deploy_board = DeployBoard.objects.get(workspace__slug=self.kwargs.get("slug"),project_id=self.kwargs.get("project_id"),)- if project_deploy_board.reactions:+ if project_deploy_board.is_reactions_enabled:return (super().get_queryset()@@ -236,15 +232,15 @@ class IssueReactionPublicViewSet(BaseViewSet):.distinct())return IssueReaction.objects.none()- except ProjectDeployBoard.DoesNotExist:+ except DeployBoard.DoesNotExist:return IssueReaction.objects.none()- def create(self, request, slug, project_id, issue_id):- project_deploy_board = ProjectDeployBoard.objects.get(- workspace__slug=slug, project_id=project_id+ def create(self, request, anchor, issue_id):+ project_deploy_board = DeployBoard.objects.get(+ anchor=anchor, entity_name="project")- if not project_deploy_board.reactions:+ if not project_deploy_board.is_reactions_enabled:return Response({"error": "Reactions are not enabled for this project board"},status=status.HTTP_400_BAD_REQUEST,@@ -253,16 +249,18 @@ class IssueReactionPublicViewSet(BaseViewSet):serializer = IssueReactionSerializer(data=request.data)if serializer.is_valid():serializer.save(- project_id=project_id, issue_id=issue_id, actor=request.user+ project_id=project_deploy_board.project_id,+ issue_id=issue_id,+ actor=request.user,)if not ProjectMember.objects.filter(- project_id=project_id,+ project_id=project_deploy_board.project_id,member=request.user,is_active=True,).exists():# Add the user for workspace tracking_ = ProjectPublicMember.objects.get_or_create(- project_id=project_id,+ project_id=project_deploy_board.project_id,member=request.user,)issue_activity.delay(@@ -272,25 +270,25 @@ class IssueReactionPublicViewSet(BaseViewSet):),actor_id=str(self.request.user.id),issue_id=str(self.kwargs.get("issue_id", None)),- project_id=str(self.kwargs.get("project_id", None)),+ project_id=str(project_deploy_board.project_id),current_instance=None,epoch=int(timezone.now().timestamp()),)return Response(serializer.data, status=status.HTTP_201_CREATED)return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)- def destroy(self, request, slug, project_id, issue_id, reaction_code):- project_deploy_board = ProjectDeployBoard.objects.get(- workspace__slug=slug, project_id=project_id+ def destroy(self, request, anchor, issue_id, reaction_code):+ project_deploy_board = DeployBoard.objects.get(+ anchor=anchor, entity_name="project")- if not project_deploy_board.reactions:+ if not project_deploy_board.is_reactions_enabled:return Response({"error": "Reactions are not enabled for this project board"},status=status.HTTP_400_BAD_REQUEST,)issue_reaction = IssueReaction.objects.get(- workspace__slug=slug,+ workspace_id=project_deploy_board.workspace_id,issue_id=issue_id,reaction=reaction_code,actor=request.user,@@ -300,7 +298,7 @@ class IssueReactionPublicViewSet(BaseViewSet):requested_data=None,actor_id=str(self.request.user.id),issue_id=str(self.kwargs.get("issue_id", None)),- project_id=str(self.kwargs.get("project_id", None)),+ project_id=str(project_deploy_board.project_id),current_instance=json.dumps({"reaction": str(reaction_code),@@ -319,30 +317,29 @@ class CommentReactionPublicViewSet(BaseViewSet):def get_queryset(self):try:- project_deploy_board = ProjectDeployBoard.objects.get(- workspace__slug=self.kwargs.get("slug"),- project_id=self.kwargs.get("project_id"),+ project_deploy_board = DeployBoard.objects.get(+ anchor=self.kwargs.get("anchor"), entity_name="project")- if project_deploy_board.reactions:+ if project_deploy_board.is_reactions_enabled:return (super().get_queryset()- .filter(workspace__slug=self.kwargs.get("slug"))- .filter(project_id=self.kwargs.get("project_id"))+ .filter(workspace_id=project_deploy_board.workspace_id)+ .filter(project_id=project_deploy_board.project_id).filter(comment_id=self.kwargs.get("comment_id")).order_by("-created_at").distinct())return CommentReaction.objects.none()- except ProjectDeployBoard.DoesNotExist:+ except DeployBoard.DoesNotExist:return CommentReaction.objects.none()- def create(self, request, slug, project_id, comment_id):- project_deploy_board = ProjectDeployBoard.objects.get(- workspace__slug=slug, project_id=project_id+ def create(self, request, anchor, comment_id):+ project_deploy_board = DeployBoard.objects.get(+ anchor=anchor, entity_name="project")- if not project_deploy_board.reactions:+ if not project_deploy_board.is_reactions_enabled:return Response({"error": "Reactions are not enabled for this board"},status=status.HTTP_400_BAD_REQUEST,@@ -351,18 +348,18 @@ class CommentReactionPublicViewSet(BaseViewSet):serializer = CommentReactionSerializer(data=request.data)if serializer.is_valid():serializer.save(- project_id=project_id,+ project_id=project_deploy_board.project_id,comment_id=comment_id,actor=request.user,)if not ProjectMember.objects.filter(- project_id=project_id,+ project_id=project_deploy_board.project_id,member=request.user,is_active=True,).exists():# Add the user for workspace tracking_ = ProjectPublicMember.objects.get_or_create(- project_id=project_id,+ project_id=project_deploy_board.project_id,member=request.user,)issue_activity.delay(@@ -379,19 +376,19 @@ class CommentReactionPublicViewSet(BaseViewSet):return Response(serializer.data, status=status.HTTP_201_CREATED)return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)- def destroy(self, request, slug, project_id, comment_id, reaction_code):- project_deploy_board = ProjectDeployBoard.objects.get(- workspace__slug=slug, project_id=project_id+ def destroy(self, request, anchor, comment_id, reaction_code):+ project_deploy_board = DeployBoard.objects.get(+ anchor=anchor, entity_name="project")- if not project_deploy_board.reactions:+ if not project_deploy_board.is_reactions_enabled:return Response({"error": "Reactions are not enabled for this board"},status=status.HTTP_400_BAD_REQUEST,)comment_reaction = CommentReaction.objects.get(- project_id=project_id,- workspace__slug=slug,+ project_id=project_deploy_board.project_id,+ workspace_id=project_deploy_board.workspace_id,comment_id=comment_id,reaction=reaction_code,actor=request.user,@@ -401,7 +398,7 @@ class CommentReactionPublicViewSet(BaseViewSet):requested_data=None,actor_id=str(self.request.user.id),issue_id=None,- project_id=str(self.kwargs.get("project_id", None)),+ project_id=str(project_deploy_board.project_id),current_instance=json.dumps({"reaction": str(reaction_code),@@ -421,36 +418,42 @@ class IssueVotePublicViewSet(BaseViewSet):def get_queryset(self):try:- project_deploy_board = ProjectDeployBoard.objects.get(- workspace__slug=self.kwargs.get("slug"),- project_id=self.kwargs.get("project_id"),+ project_deploy_board = DeployBoard.objects.get(+ workspace__slug=self.kwargs.get("anchor"),+ entity_name="project",)- if project_deploy_board.votes:+ if project_deploy_board.is_votes_enabled:return (super().get_queryset().filter(issue_id=self.kwargs.get("issue_id"))- .filter(workspace__slug=self.kwargs.get("slug"))- .filter(project_id=self.kwargs.get("project_id"))+ .filter(workspace_id=project_deploy_board.workspace_id)+ .filter(project_id=project_deploy_board.project_id))return IssueVote.objects.none()- except ProjectDeployBoard.DoesNotExist:+ except DeployBoard.DoesNotExist:return IssueVote.objects.none()- def create(self, request, slug, project_id, issue_id):+ def create(self, request, anchor, issue_id):+ print("hite")+ project_deploy_board = DeployBoard.objects.get(+ anchor=anchor, entity_name="project"+ )+ print("awer")issue_vote, _ = IssueVote.objects.get_or_create(actor_id=request.user.id,- project_id=project_id,+ project_id=project_deploy_board.project_id,issue_id=issue_id,)+ print("AWer")# Add the user for workspace trackingif not ProjectMember.objects.filter(- project_id=project_id,+ project_id=project_deploy_board.project_id,member=request.user,is_active=True,).exists():_ = ProjectPublicMember.objects.get_or_create(- project_id=project_id,+ project_id=project_deploy_board.project_id,member=request.user,)issue_vote.vote = request.data.get("vote", 1)@@ -462,26 +465,29 @@ class IssueVotePublicViewSet(BaseViewSet):),actor_id=str(self.request.user.id),issue_id=str(self.kwargs.get("issue_id", None)),- project_id=str(self.kwargs.get("project_id", None)),+ project_id=str(project_deploy_board.project_id),current_instance=None,epoch=int(timezone.now().timestamp()),)serializer = IssueVoteSerializer(issue_vote)return Response(serializer.data, status=status.HTTP_201_CREATED)- def destroy(self, request, slug, project_id, issue_id):+ def destroy(self, request, anchor, issue_id):+ project_deploy_board = DeployBoard.objects.get(+ anchor=anchor, entity_name="project"+ )issue_vote = IssueVote.objects.get(- workspace__slug=slug,- project_id=project_id,issue_id=issue_id,actor_id=request.user.id,+ project_id=project_deploy_board.project_id,+ workspace_id=project_deploy_board.workspace_id,)issue_activity.delay(type="issue_vote.activity.deleted",requested_data=None,actor_id=str(self.request.user.id),issue_id=str(self.kwargs.get("issue_id", None)),- project_id=str(self.kwargs.get("project_id", None)),+ project_id=str(project_deploy_board.project_id),current_instance=json.dumps({"vote": str(issue_vote.vote),@@ -499,9 +505,14 @@ class IssueRetrievePublicEndpoint(BaseAPIView):AllowAny,]- def get(self, request, slug, project_id, issue_id):+ def get(self, request, anchor, issue_id):+ project_deploy_board = DeployBoard.objects.get(+ anchor=anchor, entity_name="project"+ )issue = Issue.objects.get(- workspace__slug=slug, project_id=project_id, pk=issue_id+ workspace_id=project_deploy_board.workspace_id,+ project_id=project_deploy_board.project_id,+ pk=issue_id,)serializer = IssuePublicSerializer(issue)return Response(serializer.data, status=status.HTTP_200_OK)@@ -512,14 +523,17 @@ class ProjectIssuesPublicEndpoint(BaseAPIView):AllowAny,]- def get(self, request, slug, project_id):- if not ProjectDeployBoard.objects.filter(- workspace__slug=slug, project_id=project_id+ def get(self, request, anchor):+ if not DeployBoard.objects.filter(+ anchor=anchor, entity_name="project").exists():return Response({"error": "Project is not published"},status=status.HTTP_404_NOT_FOUND,)+ project_deploy_board = DeployBoard.objects.get(+ anchor=anchor, entity_name="project"+ )filters = issue_filters(request.query_params, "GET")@@ -544,8 +558,8 @@ class ProjectIssuesPublicEndpoint(BaseAPIView):.annotate(count=Func(F("id"), function="Count")).values("count"))- .filter(project_id=project_id)- .filter(workspace__slug=slug)+ .filter(project_id=project_deploy_board.project_id)+ .filter(workspace_id=project_deploy_board.workspace_id).select_related("project", "workspace", "state", "parent").prefetch_related("assignees", "labels").prefetch_related(@@ -652,8 +666,8 @@ class ProjectIssuesPublicEndpoint(BaseAPIView):states = (State.objects.filter(~Q(name="Triage"),- workspace__slug=slug,- project_id=project_id,+ workspace_id=project_deploy_board.workspace_id,+ project_id=project_deploy_board.project_id,).annotate(custom_order=Case(@@ -670,7 +684,8 @@ class ProjectIssuesPublicEndpoint(BaseAPIView):)labels = Label.objects.filter(- workspace__slug=slug, project_id=project_id+ workspace_id=project_deploy_board.workspace_id,+ project_id=project_deploy_board.project_id,).values("id", "name", "color", "parent")## Grouping the resultsdiff --git a/apiserver/plane/space/views/project.py b/apiserver/plane/space/views/project.pyindex 10a3c38791..76f1600eee 100644--- a/apiserver/plane/space/views/project.py+++ b/apiserver/plane/space/views/project.py@@ -11,10 +11,10 @@ from rest_framework.permissions import AllowAny# Module importsfrom .base import BaseAPIView-from plane.app.serializers import ProjectDeployBoardSerializer+from plane.app.serializers import DeployBoardSerializerfrom plane.db.models import (Project,- ProjectDeployBoard,+ DeployBoard,)@@ -23,11 +23,11 @@ class ProjectDeployBoardPublicSettingsEndpoint(BaseAPIView):AllowAny,]- def get(self, request, slug, project_id):- project_deploy_board = ProjectDeployBoard.objects.get(- workspace__slug=slug, project_id=project_id+ def get(self, request, anchor):+ project_deploy_board = DeployBoard.objects.get(+ anchor=anchor, entity_name="project")- serializer = ProjectDeployBoardSerializer(project_deploy_board)+ serializer = DeployBoardSerializer(project_deploy_board)return Response(serializer.data, status=status.HTTP_200_OK)@@ -36,13 +36,16 @@ class WorkspaceProjectDeployBoardEndpoint(BaseAPIView):AllowAny,]- def get(self, request, slug):+ def get(self, request, anchor):+ deploy_board = DeployBoard.objects.filter(anchor=anchor, entity_name="project").values_listprojects = (- Project.objects.filter(workspace__slug=slug)+ Project.objects.filter(workspace=deploy_board.workspace).annotate(is_public=Exists(- ProjectDeployBoard.objects.filter(- workspace__slug=slug, project_id=OuterRef("pk")+ DeployBoard.objects.filter(+ anchor=anchor,+ project_id=OuterRef("pk"),+ entity_name="project",)))@@ -58,3 +61,16 @@ class WorkspaceProjectDeployBoardEndpoint(BaseAPIView):)return Response(projects, status=status.HTTP_200_OK)+++class WorkspaceProjectAnchorEndpoint(BaseAPIView):+ permission_classes = [+ AllowAny,+ ]++ def get(self, request, slug, project_id):+ project_deploy_board = DeployBoard.objects.get(+ workspace__slug=slug, project_id=project_id+ )+ serializer = DeployBoardSerializer(project_deploy_board)+ return Response(serializer.data, status=status.HTTP_200_OK)diff --git a/apiserver/plane/utils/analytics_plot.py b/apiserver/plane/utils/analytics_plot.pyindex cd57690c60..59ddbd9334 100644--- a/apiserver/plane/utils/analytics_plot.py+++ b/apiserver/plane/utils/analytics_plot.py@@ -4,18 +4,28 @@ from itertools import groupby# Django importfrom django.db import models-from django.db.models import Case, CharField, Count, F, Sum, Value, When+from django.db.models import (+ Case,+ CharField,+ Count,+ F,+ Sum,+ Value,+ When,+ IntegerField,+)from django.db.models.functions import (Coalesce,Concat,ExtractMonth,ExtractYear,TruncDate,+ Cast,)from django.utils import timezone# Module imports-from plane.db.models import Issue+from plane.db.models import Issue, Projectdef annotate_with_monthly_dimension(queryset, field_name, attribute):@@ -87,9 +97,9 @@ def build_graph_plot(queryset, x_axis, y_axis, segment=None):# Estimateelse:- queryset = queryset.annotate(estimate=Sum("estimate_point")).order_by(- x_axis- )+ queryset = queryset.annotate(+ estimate=Sum(Cast("estimate_point__value", IntegerField()))+ ).order_by(x_axis)queryset = (queryset.annotate(segment=F(segment)) if segment else queryset)@@ -110,9 +120,33 @@ def build_graph_plot(queryset, x_axis, y_axis, segment=None):return sort_data(grouped_data, temp_axis)-def burndown_plot(queryset, slug, project_id, cycle_id=None, module_id=None):+def burndown_plot(+ queryset,+ slug,+ project_id,+ plot_type,+ cycle_id=None,+ module_id=None,+):# Total Issues in Cycle or Moduletotal_issues = queryset.total_issues+ # check whether the estimate is a point or not+ estimate_type = Project.objects.filter(+ workspace__slug=slug,+ pk=project_id,+ estimate__isnull=False,+ estimate__type="points",+ ).exists()+ if estimate_type and plot_type == "points":+ issue_estimates = Issue.objects.filter(+ workspace__slug=slug,+ project_id=project_id,+ issue_cycle__cycle_id=cycle_id,+ estimate_point__isnull=False,+ ).values_list("estimate_point__value", flat=True)++ issue_estimates = [int(value) for value in issue_estimates]+ total_estimate_points = sum(issue_estimates)if cycle_id:if queryset.end_date and queryset.start_date:@@ -128,18 +162,32 @@ def burndown_plot(queryset, slug, project_id, cycle_id=None, module_id=None):chart_data = {str(date): 0 for date in date_range}- completed_issues_distribution = (- Issue.issue_objects.filter(- workspace__slug=slug,- project_id=project_id,- issue_cycle__cycle_id=cycle_id,+ if plot_type == "points":+ completed_issues_estimate_point_distribution = (+ Issue.issue_objects.filter(+ workspace__slug=slug,+ project_id=project_id,+ issue_cycle__cycle_id=cycle_id,+ estimate_point__isnull=False,+ )+ .annotate(date=TruncDate("completed_at"))+ .values("date")+ .values("date", "estimate_point__value")+ .order_by("date")+ )+ else:+ completed_issues_distribution = (+ Issue.issue_objects.filter(+ workspace__slug=slug,+ project_id=project_id,+ issue_cycle__cycle_id=cycle_id,+ )+ .annotate(date=TruncDate("completed_at"))+ .values("date")+ .annotate(total_completed=Count("id"))+ .values("date", "total_completed")+ .order_by("date"))- .annotate(date=TruncDate("completed_at"))- .values("date")- .annotate(total_completed=Count("id"))- .values("date", "total_completed")- .order_by("date")- )if module_id:# Get all dates between the two dates@@ -152,31 +200,59 @@ def burndown_plot(queryset, slug, project_id, cycle_id=None, module_id=None):chart_data = {str(date): 0 for date in date_range}- completed_issues_distribution = (- Issue.issue_objects.filter(- workspace__slug=slug,- project_id=project_id,- issue_module__module_id=module_id,+ if plot_type == "points":+ completed_issues_estimate_point_distribution = (+ Issue.issue_objects.filter(+ workspace__slug=slug,+ project_id=project_id,+ issue_module__module_id=module_id,+ estimate_point__isnull=False,+ )+ .annotate(date=TruncDate("completed_at"))+ .values("date")+ .values("date", "estimate_point__value")+ .order_by("date")+ )+ else:+ completed_issues_distribution = (+ Issue.issue_objects.filter(+ workspace__slug=slug,+ project_id=project_id,+ issue_module__module_id=module_id,+ )+ .annotate(date=TruncDate("completed_at"))+ .values("date")+ .annotate(total_completed=Count("id"))+ .values("date", "total_completed")+ .order_by("date"))- .annotate(date=TruncDate("completed_at"))- .values("date")- .annotate(total_completed=Count("id"))- .values("date", "total_completed")- .order_by("date")- )for date in date_range:- cumulative_pending_issues = total_issues- total_completed = 0- total_completed = sum(- item["total_completed"]- for item in completed_issues_distribution- if item["date"] is not None and item["date"] <= date- )- cumulative_pending_issues -= total_completed- if date > timezone.now().date():- chart_data[str(date)] = None+ if plot_type == "points":+ cumulative_pending_issues = total_estimate_points+ total_completed = 0+ total_completed = sum(+ int(item["estimate_point__value"])+ for item in completed_issues_estimate_point_distribution+ if item["date"] is not None and item["date"] <= date+ )+ cumulative_pending_issues -= total_completed+ if date > timezone.now().date():+ chart_data[str(date)] = None+ else:+ chart_data[str(date)] = cumulative_pending_issueselse:- chart_data[str(date)] = cumulative_pending_issues+ cumulative_pending_issues = total_issues+ total_completed = 0+ total_completed = sum(+ item["total_completed"]+ for item in completed_issues_distribution+ if item["date"] is not None and item["date"] <= date+ )+ cumulative_pending_issues -= total_completed+ if date > timezone.now().date():+ chart_data[str(date)] = None+ else:+ chart_data[str(date)] = cumulative_pending_issuesreturn chart_datadiff --git a/packages/types/src/analytics.d.ts b/packages/types/src/analytics.d.tsindex 35da4b723d..2fb7ad51a7 100644--- a/packages/types/src/analytics.d.ts+++ b/packages/types/src/analytics.d.ts@@ -54,7 +54,7 @@ export type TXAxisValues =| "state__group"| "labels__id"| "assignees__id"- | "estimate_point"+ | "estimate_point__value"| "issue_cycle__cycle_id"| "issue_module__module_id"| "priority"diff --git a/packages/types/src/enums.ts b/packages/types/src/enums.tsindex a4d098506e..cc85753740 100644--- a/packages/types/src/enums.ts+++ b/packages/types/src/enums.ts@@ -24,3 +24,16 @@ export enum EIssueCommentAccessSpecifier {EXTERNAL = "EXTERNAL",INTERNAL = "INTERNAL",}++// estimates+export enum EEstimateSystem {+ POINTS = "points",+ CATEGORIES = "categories",+ TIME = "time",+}++export enum EEstimateUpdateStages {+ CREATE = "create",+ EDIT = "edit",+ SWITCH = "switch",+}diff --git a/packages/types/src/estimate.d.ts b/packages/types/src/estimate.d.tsindex 96b584ce1f..9bad7e260f 100644--- a/packages/types/src/estimate.d.ts+++ b/packages/types/src/estimate.d.ts@@ -1,40 +1,77 @@-export interface IEstimate {- created_at: Date;- created_by: string;- description: string;- id: string;- name: string;- project: string;- project_detail: IProject;- updated_at: Date;- updated_by: string;- points: IEstimatePoint[];- workspace: string;- workspace_detail: IWorkspace;-}+import { EEstimateSystem, EEstimateUpdateStages } from "./enums";export interface IEstimatePoint {- created_at: string;- created_by: string;- description: string;- estimate: string;- id: string;- key: number;- project: string;- updated_at: string;- updated_by: string;- value: string;- workspace: string;+ id: string | undefined;+ key: number | undefined;+ value: string | undefined;+ description: string | undefined;+ workspace: string | undefined;+ project: string | undefined;+ estimate: string | undefined;+ created_at: Date | undefined;+ updated_at: Date | undefined;+ created_by: string | undefined;+ updated_by: string | undefined;+}++export type TEstimateSystemKeys =+ | EEstimateSystem.POINTS+ | EEstimateSystem.CATEGORIES+ | EEstimateSystem.TIME;++export interface IEstimate {+ id: string | undefined;+ name: string | undefined;+ description: string | undefined;+ type: TEstimateSystemKeys | undefined; // categories, points, time+ points: IEstimatePoint[] | undefined;+ workspace: string | undefined;+ project: string | undefined;+ last_used: boolean | undefined;+ created_at: Date | undefined;+ updated_at: Date | undefined;+ created_by: string | undefined;+ updated_by: string | undefined;}export interface IEstimateFormData {- estimate: {- name: string;- description: string;+ estimate?: {+ name?: string;+ type?: string;+ last_used?: boolean;};estimate_points: {- id?: string;+ id?: string | undefined;key: number;value: string;}[];}++export type TEstimatePointsObject = {+ id?: string | undefined;+ key: number;+ value: string;+};++export type TTemplateValues = {+ title: string;+ values: TEstimatePointsObject[];+ hide?: boolean;+};++export type TEstimateSystem = {+ name: string;+ templates: Record<string, TTemplateValues>;+ is_available: boolean;+ is_ee: boolean;+};++export type TEstimateSystems = {+ [K in TEstimateSystemKeys]: TEstimateSystem;+};++// update estimates+export type TEstimateUpdateStageKeys =+ | EEstimateUpdateStages.CREATE+ | EEstimateUpdateStages.EDIT+ | EEstimateUpdateStages.SWITCH;diff --git a/packages/types/src/index.d.ts b/packages/types/src/index.d.tsindex b8dd2d3c15..25c2b255b3 100644--- a/packages/types/src/index.d.ts+++ b/packages/types/src/index.d.ts@@ -15,7 +15,6 @@ export * from "./importer";export * from "./inbox";export * from "./analytics";export * from "./api_token";-export * from "./app";export * from "./auth";export * from "./calendar";export * from "./instance";@@ -28,3 +27,4 @@ export * from "./webhook";export * from "./workspace-views";export * from "./common";export * from "./pragmatic";+export * from "./publish";diff --git a/packages/types/src/issues/issue.d.ts b/packages/types/src/issues/issue.d.tsindex 42c95dc4e3..990b308e7d 100644--- a/packages/types/src/issues/issue.d.ts+++ b/packages/types/src/issues/issue.d.ts@@ -15,7 +15,7 @@ export type TIssue = {priority: TIssuePriorities;label_ids: string[];assignee_ids: string[];- estimate_point: number | null;+ estimate_point: string | null;sub_issues_count: number;attachment_count: number;diff --git a/packages/types/src/module/modules.d.ts b/packages/types/src/module/modules.d.tsindex 0019781bad..53be143479 100644--- a/packages/types/src/module/modules.d.ts+++ b/packages/types/src/module/modules.d.ts@@ -44,6 +44,8 @@ export interface IModule {target_date: string | null;total_issues: number;unstarted_issues: number;+ total_estimate_points?: number;+ completed_estimate_points?: number;updated_at: string;updated_by?: string;archived_at: string | null;diff --git a/packages/types/src/project/projects.d.ts b/packages/types/src/project/projects.d.tsindex ee974fd639..59ccf73b6e 100644--- a/packages/types/src/project/projects.d.ts+++ b/packages/types/src/project/projects.d.ts@@ -32,7 +32,7 @@ export interface IProject {estimate: string | null;id: string;identifier: string;- is_deployed: boolean;+ anchor: string | null;is_favorite: boolean;is_member: boolean;logo_props: TLogoProps;diff --git a/packages/types/src/publish.d.ts b/packages/types/src/publish.d.tsnew file mode 100644index 0000000000..883ef8dd6d--- /dev/null+++ b/packages/types/src/publish.d.ts@@ -0,0 +1,41 @@+import { IProject, IProjectLite, IWorkspaceLite } from "@plane/types";++export type TPublishEntityType = "project";++export type TProjectPublishLayouts =+ | "calendar"+ | "gantt"+ | "kanban"+ | "list"+ | "spreadsheet";++export type TPublishViewProps = {+ calendar?: boolean;+ gantt?: boolean;+ kanban?: boolean;+ list?: boolean;+ spreadsheet?: boolean;+};++export type TProjectDetails = IProjectLite &+ Pick<IProject, "cover_image" | "logo_props" | "description">;++export type TPublishSettings = {+ anchor: string | undefined;+ is_comments_enabled: boolean;+ created_at: string | undefined;+ created_by: string | undefined;+ entity_identifier: string | undefined;+ entity_name: TPublishEntityType | undefined;+ id: string | undefined;+ inbox: unknown;+ project: string | undefined;+ project_details: TProjectDetails | undefined;+ is_reactions_enabled: boolean;+ updated_at: string | undefined;+ updated_by: string | undefined;+ view_props: TViewProps | undefined;+ is_votes_enabled: boolean;+ workspace: string | undefined;+ workspace_detail: IWorkspaceLite | undefined;+};diff --git a/packages/ui/package.json b/packages/ui/package.jsonindex 84a655bf74..ed09323397 100644--- a/packages/ui/package.json+++ b/packages/ui/package.json@@ -24,7 +24,7 @@"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.3","@blueprintjs/core": "^4.16.3","@blueprintjs/popover2": "^1.13.3",- "@headlessui/react": "^1.7.17",+ "@headlessui/react": "^2.0.3","@popperjs/core": "^2.11.8","clsx": "^2.0.0","emoji-picker-react": "^4.5.16",@@ -33,7 +33,7 @@"react-color": "^2.19.3","react-dom": "^18.2.0","react-popper": "^2.3.0",- "sonner": "^1.4.2",+ "sonner": "^1.4.41","tailwind-merge": "^2.0.0"},"devDependencies": {diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.tsindex c3c0cd4f10..05adddfb0f 100644--- a/packages/ui/src/index.ts+++ b/packages/ui/src/index.ts@@ -14,5 +14,6 @@ export * from "./loader";export * from "./control-link";export * from "./toast";export * from "./drag-handle";+export * from "./typography";export * from "./drop-indicator";export * from "./sortable";diff --git a/packages/ui/src/sortable/sortable.stories.tsx b/packages/ui/src/sortable/sortable.stories.tsxindex 6d40ddc2ee..2d469b767f 100644--- a/packages/ui/src/sortable/sortable.stories.tsx+++ b/packages/ui/src/sortable/sortable.stories.tsx@@ -1,6 +1,5 @@import type { Meta, StoryObj } from "@storybook/react";import React from "react";-import { Draggable } from "./draggable";import { Sortable } from "./sortable";const meta: Meta<typeof Sortable> = {@@ -13,7 +12,7 @@ type Story = StoryObj<typeof Sortable>;const data = [{ id: "1", name: "John Doe" },- { id: "2", name: "Jane Doe 2" },+ { id: "2", name: "Satish" },{ id: "3", name: "Alice" },{ id: "4", name: "Bob" },{ id: "5", name: "Charlie" },diff --git a/packages/ui/src/sortable/sortable.tsx b/packages/ui/src/sortable/sortable.tsxindex 9d79a8f590..b495d535ec 100644--- a/packages/ui/src/sortable/sortable.tsx+++ b/packages/ui/src/sortable/sortable.tsx@@ -8,7 +8,7 @@ type Props<T> = {onChange: (data: T[]) => void;keyExtractor: (item: T, index: number) => string;containerClassName?: string;- id: string;+ id?: string;};const moveItem = <T,>(@@ -17,7 +17,7 @@ const moveItem = <T,>(destination: T & Record<symbol, string>,keyExtractor: (item: T, index: number) => string) => {- const sourceIndex = data.indexOf(source);+ const sourceIndex = data.findIndex((item, index) => keyExtractor(item, index) === keyExtractor(source, 0));if (sourceIndex === -1) return data;const destinationIndex = data.findIndex((item, index) => keyExtractor(item, index) === keyExtractor(destination, 0));diff --git a/space/app/[workspaceSlug]/[projectId]/page.ts b/space/app/[workspaceSlug]/[projectId]/page.tsnew file mode 100644index 0000000000..4f18e8bd5c--- /dev/null+++ b/space/app/[workspaceSlug]/[projectId]/page.ts@@ -0,0 +1,42 @@+import { notFound, redirect } from "next/navigation";+// types+import { TPublishSettings } from "@plane/types";+// services+import PublishService from "@/services/publish.service";++const publishService = new PublishService();++type Props = {+ params: {+ workspaceSlug: string;+ projectId: string;+ };+ searchParams: any;+};++export default async function IssuesPage(props: Props) {+ const { params, searchParams } = props;+ // query params+ const { workspaceSlug, projectId } = params;+ const { board, peekId } = searchParams;++ let response: TPublishSettings | undefined = undefined;+ try {+ response = await publishService.fetchAnchorFromProjectDetails(workspaceSlug, projectId);+ } catch (error) {+ // redirect to 404 page on error+ notFound();+ }++ let url = "";+ if (response?.entity_name === "project") {+ url = `/issues/${response?.anchor}`;+ const params = new URLSearchParams();+ if (board) params.append("board", board);+ if (peekId) params.append("peekId", peekId);+ if (params.toString()) url += `?${params.toString()}`;+ redirect(url);+ } else {+ notFound();+ }+}diff --git a/space/app/[workspace_slug]/[project_id]/page.tsx b/space/app/[workspace_slug]/[project_id]/page.tsxdeleted file mode 100644index 0d08ae7eb1..0000000000--- a/space/app/[workspace_slug]/[project_id]/page.tsx+++ /dev/null@@ -1,16 +0,0 @@-"use client";--import { useSearchParams } from "next/navigation";-// components-import { ProjectDetailsView } from "@/components/views";--export default function WorkspaceProjectPage({ params }: { params: { workspace_slug: any; project_id: any } }) {- const { workspace_slug, project_id } = params;-- const searchParams = useSearchParams();- const peekId = searchParams.get("peekId") || undefined;-- if (!workspace_slug || !project_id) return <></>;-- return <ProjectDetailsView workspaceSlug={workspace_slug} projectId={project_id} peekId={peekId} />;-}diff --git a/space/app/error.tsx b/space/app/error.tsxindex 2d6f22e907..e47a1af1d5 100644--- a/space/app/error.tsx+++ b/space/app/error.tsx@@ -1,38 +1,47 @@"use client";-import Image from "next/image";-import { useTheme } from "next-themes";+// uiimport { Button } from "@plane/ui";-// assets-import InstanceFailureDarkImage from "@/public/instance/instance-failure-dark.svg";-import InstanceFailureImage from "@/public/instance/instance-failure.svg";--export default function InstanceError() {- const { resolvedTheme } = useTheme();-- const instanceImage = resolvedTheme === "dark" ? InstanceFailureDarkImage : InstanceFailureImage;+const ErrorPage = () => {const handleRetry = () => {window.location.reload();};return (- <div className="relative h-screen overflow-x-hidden overflow-y-auto container px-5 mx-auto flex justify-center items-center">- <div className="w-auto max-w-2xl relative space-y-8 py-10">- <div className="relative flex flex-col justify-center items-center space-y-4">- <Image src={instanceImage} alt="Plane instance failure image" />- <h3 className="font-medium text-2xl text-white ">Unable to fetch instance details.</h3>- <p className="font-medium text-base text-center">- We were unable to fetch the details of the instance. <br />- Fret not, it might just be a connectivity issue.+ <div className="grid h-screen place-items-center p-4">+ <div className="space-y-8 text-center">+ <div className="space-y-2">+ <h3 className="text-lg font-semibold">Exception Detected!</h3>+ <p className="mx-auto w-1/2 text-sm text-custom-text-200">+ We{"'"}re Sorry! An exception has been detected, and our engineering team has been notified. We apologize+ for any inconvenience this may have caused. Please reach out to our engineering team at{" "}+ <a href="mailto:[email protected]" className="text-custom-primary">+ </a>{" "}+ or on our{" "}+ <a+ href="https://discord.com/invite/A92xrEGCge"+ target="_blank"+ className="text-custom-primary"+ rel="noopener noreferrer"+ >+ Discord+ </a>{" "}+ server for further assistance.</p></div>- <div className="flex justify-center">- <Button size="md" onClick={handleRetry}>- Retry+ <div className="flex items-center justify-center gap-2">+ <Button variant="primary" size="md" onClick={handleRetry}>+ Refresh</Button>+ {/* <Button variant="neutral-primary" size="md" onClick={() => {}}>+ Sign out+ </Button> */}</div></div></div>);-}+};++export default ErrorPage;diff --git a/space/app/[workspace_slug]/[project_id]/layout.tsx b/space/app/issues/[anchor]/layout.tsxsimilarity index 54%rename from space/app/[workspace_slug]/[project_id]/layout.tsxrename to space/app/issues/[anchor]/layout.tsxindex b1e134ea67..91291e481c 100644--- a/space/app/[workspace_slug]/[project_id]/layout.tsx+++ b/space/app/issues/[anchor]/layout.tsx@@ -1,25 +1,39 @@+"use client";++import { observer } from "mobx-react-lite";import Image from "next/image";-import { notFound } from "next/navigation";+import useSWR from "swr";// components-import IssueNavbar from "@/components/issues/navbar";+import { LogoSpinner } from "@/components/common";+import { IssuesNavbarRoot } from "@/components/issues";+// hooks+import { usePublish, usePublishList } from "@/hooks/store";// assets-import planeLogo from "public/plane-logo.svg";+import planeLogo from "@/public/plane-logo.svg";-export default async function ProjectLayout({- children,- params,-}: {+type Props = {children: React.ReactNode;- params: { workspace_slug: string; project_id: string };-}) {- const { workspace_slug, project_id } = params;+ params: {+ anchor: string;+ };+};++const IssuesLayout = observer((props: Props) => {+ const { children, params } = props;+ // params+ const { anchor } = params;+ // store hooks+ const { fetchPublishSettings } = usePublishList();+ const publishSettings = usePublish(anchor);+ // fetch publish settings+ useSWR(anchor ? `PUBLISH_SETTINGS_${anchor}` : null, anchor ? () => fetchPublishSettings(anchor) : null);- if (!workspace_slug || !project_id) notFound();+ if (!publishSettings) return <LogoSpinner />;return (<div className="relative flex h-screen min-h-[500px] w-screen flex-col overflow-hidden"><div className="relative flex h-[60px] flex-shrink-0 select-none items-center border-b border-custom-border-300 bg-custom-sidebar-background-100">- <IssueNavbar workspaceSlug={workspace_slug} projectId={project_id} />+ <IssuesNavbarRoot publishSettings={publishSettings} /></div><div className="relative h-full w-full overflow-hidden bg-custom-background-90">{children}</div><a@@ -37,4 +51,6 @@ export default async function ProjectLayout({</a></div>);-}+});++export default IssuesLayout;diff --git a/space/app/issues/[anchor]/page.tsx b/space/app/issues/[anchor]/page.tsxnew file mode 100644index 0000000000..b3c9353e62--- /dev/null+++ b/space/app/issues/[anchor]/page.tsx@@ -0,0 +1,30 @@+"use client";++import { observer } from "mobx-react-lite";+import { useSearchParams } from "next/navigation";+// components+import { IssuesLayoutsRoot } from "@/components/issues";+// hooks+import { usePublish } from "@/hooks/store";++type Props = {+ params: {+ anchor: string;+ };+};++const IssuesPage = observer((props: Props) => {+ const { params } = props;+ const { anchor } = params;+ // params+ const searchParams = useSearchParams();+ const peekId = searchParams.get("peekId") || undefined;++ const publishSettings = usePublish(anchor);++ if (!publishSettings) return null;++ return <IssuesLayoutsRoot peekId={peekId} publishSettings={publishSettings} />;+});++export default IssuesPage;diff --git a/space/app/not-found.tsx b/space/app/not-found.tsxindex cae576319b..c5320b2dcf 100644--- a/space/app/not-found.tsx+++ b/space/app/not-found.tsx@@ -4,20 +4,18 @@ import Image from "next/image";// assetsimport UserLoggedInImage from "public/user-logged-in.svg";-export default function NotFound() {- return (- <div className="flex h-screen w-screen flex-col">- <div className="grid h-full w-full place-items-center p-6">- <div className="text-center">- <div className="mx-auto grid h-52 w-52 place-items-center rounded-full bg-custom-background-80">- <div className="h-32 w-32">- <Image src={UserLoggedInImage} alt="User already logged in" />- </div>- </div>- <h1 className="mt-12 text-3xl font-semibold">Not Found</h1>- <p className="mt-4">Please enter the appropriate project URL to view the issue board.</p>+const NotFound = () => (+ <div className="h-screen w-screen grid place-items-center">+ <div className="text-center">+ <div className="mx-auto size-52 grid place-items-center rounded-full bg-custom-background-80">+ <div className="size-32">+ <Image src={UserLoggedInImage} alt="User already logged in" /></div></div>+ <h1 className="mt-12 text-3xl font-semibold">Not Found</h1>+ <p className="mt-4">Please enter the appropriate project URL to view the issue board.</p></div>- );-}+ </div>+);++export default NotFound;diff --git a/space/components/account/user-logged-in.tsx b/space/components/account/user-logged-in.tsxindex 33be330fa5..5975d73b6c 100644--- a/space/components/account/user-logged-in.tsx+++ b/space/components/account/user-logged-in.tsx@@ -1,36 +1,44 @@"use client";+import { observer } from "mobx-react-lite";import Image from "next/image";+import { useTheme } from "next-themes";// components-import { UserAvatar } from "@/components/issues/navbar/user-avatar";+import { UserAvatar } from "@/components/issues";// hooksimport { useUser } from "@/hooks/store";// assets-import PlaneLogo from "@/public/plane-logos/black-horizontal-with-blue-logo.png";+import PlaneBlackLogo from "@/public/plane-logos/black-horizontal-with-blue-logo.png";+import PlaneWhiteLogo from "@/public/plane-logos/white-horizontal-with-blue-logo.png";import UserLoggedInImage from "@/public/user-logged-in.svg";-export const UserLoggedIn = () => {+export const UserLoggedIn = observer(() => {+ // store hooksconst { data: user } = useUser();+ // next-themes+ const { resolvedTheme } = useTheme();++ const logo = resolvedTheme === "dark" ? PlaneWhiteLogo : PlaneBlackLogo;if (!user) return null;return (- <div className="flex h-screen w-screen flex-col">+ <div className="flex flex-col h-screen w-screen"><div className="relative flex w-full items-center justify-between gap-4 border-b border-custom-border-200 px-6 py-5">- <div>- <Image src={PlaneLogo} alt="User already logged in" />+ <div className="h-[30px] w-[133px]">+ <Image src={logo} alt="Plane logo" /></div><UserAvatar /></div>- <div className="grid h-full w-full place-items-center p-6">+ <div className="size-full grid place-items-center p-6"><div className="text-center">- <div className="mx-auto grid h-52 w-52 place-items-center rounded-full bg-custom-background-80">- <div className="h-32 w-32">+ <div className="mx-auto size-52 grid place-items-center rounded-full bg-custom-background-80">+ <div className="size-32"><Image src={UserLoggedInImage} alt="User already logged in" /></div></div>- <h1 className="mt-12 text-3xl font-semibold">Logged in Successfully!</h1>+ <h1 className="mt-12 text-3xl font-semibold">Logged in successfully!</h1><p className="mt-4">You{"'"}ve successfully logged in. Please enter the appropriate project URL to view the issue board.</p>@@ -38,4 +46,4 @@ export const UserLoggedIn = () => {</div></div>);-};+});diff --git a/space/components/common/index.ts b/space/components/common/index.tsindex c4ea97f3c3..1949c069be 100644--- a/space/components/common/index.ts+++ b/space/components/common/index.ts@@ -1,3 +1,2 @@-export * from "./latest-feature-block";export * from "./project-logo";export * from "./logo-spinner";diff --git a/space/components/common/latest-feature-block.tsx b/space/components/common/latest-feature-block.tsxdeleted file mode 100644index c1b5db954d..0000000000--- a/space/components/common/latest-feature-block.tsx+++ /dev/null@@ -1,40 +0,0 @@-import Image from "next/image";-import Link from "next/link";-import { useTheme } from "next-themes";-// icons-import { Lightbulb } from "lucide-react";-// images-import latestFeatures from "public/onboarding/onboarding-pages.svg";--export const LatestFeatureBlock = () => {- const { resolvedTheme } = useTheme();-- return (- <>- <div className="mx-auto mt-16 flex rounded-[3.5px] border border-onboarding-border-200 bg-onboarding-background-100 py-2 sm:w-96">- <Lightbulb className="mx-3 mr-2 h-7 w-7" />- <p className="text-left text-sm text-onboarding-text-100">- Pages gets a facelift! Write anything and use Galileo to help you start.{" "}- <Link href="https://plane.so/changelog" target="_blank" rel="noopener noreferrer">- <span className="text-sm font-medium underline hover:cursor-pointer">Learn more</span>- </Link>- </p>- </div>- <div- className={`mx-auto mt-8 overflow-hidden rounded-md border border-onboarding-border-200 object-cover sm:h-52 sm:w-96 ${- resolvedTheme === "dark" ? "bg-onboarding-background-100" : "bg-custom-primary-70"- }`}- >- <div className="h-[90%]">- <Image- src={latestFeatures}- alt="Plane Issues"- className={`-mt-2 ml-10 h-full rounded-md ${- resolvedTheme === "dark" ? "bg-onboarding-background-100" : "bg-custom-primary-70"- } `}- />- </div>- </div>- </>- );-};diff --git a/space/components/instance/index.ts b/space/components/instance/index.tsindex 6568894f00..be80bc6694 100644--- a/space/components/instance/index.ts+++ b/space/components/instance/index.ts@@ -1,2 +1 @@-export * from "./not-ready-view";export * from "./instance-failure-view";diff --git a/space/components/instance/not-ready-view.tsx b/space/components/instance/not-ready-view.tsxdeleted file mode 100644index be46a9473f..0000000000--- a/space/components/instance/not-ready-view.tsx+++ /dev/null@@ -1,62 +0,0 @@-"use client";--import { FC } from "react";-import Image from "next/image";-import Link from "next/link";-import { useTheme } from "next-themes";-// ui-import { Button } from "@plane/ui";-// helper-import { GOD_MODE_URL, SPACE_BASE_PATH } from "@/helpers/common.helper";-// images-import PlaneTakeOffImage from "@/public/instance/plane-takeoff.png";-import PlaneBackgroundPatternDark from "public/auth/background-pattern-dark.svg";-import PlaneBackgroundPattern from "public/auth/background-pattern.svg";-import BlackHorizontalLogo from "public/plane-logos/black-horizontal-with-blue-logo.png";-import WhiteHorizontalLogo from "public/plane-logos/white-horizontal-with-blue-logo.png";--export const InstanceNotReady: FC = () => {- const { resolvedTheme } = useTheme();- const patternBackground = resolvedTheme === "dark" ? PlaneBackgroundPatternDark : PlaneBackgroundPattern;-- const logo = resolvedTheme === "light" ? BlackHorizontalLogo : WhiteHorizontalLogo;-- return (- <div className="relative">- <div className="h-screen w-full overflow-hidden overflow-y-auto flex flex-col">- <div className="container h-[110px] flex-shrink-0 mx-auto px-5 lg:px-0 flex items-center justify-between gap-5 z-50">- <div className="flex items-center gap-x-2 py-10">- <Link href={`${SPACE_BASE_PATH}/`} className="h-[30px] w-[133px]">- <Image src={logo} alt="Plane logo" />- </Link>- </div>- </div>-- <div className="absolute inset-0 z-0">- <Image src={patternBackground} className="w-screen h-full object-cover" alt="Plane background pattern" />- </div>-- <div className="relative z-10 mb-[110px] flex-grow">- <div className="h-full w-full relative container px-5 mx-auto flex justify-center items-center">- <div className="w-auto max-w-2xl relative space-y-8 py-10">- <div className="relative flex flex-col justify-center items-center space-y-4">- <h1 className="text-3xl font-bold pb-3">Welcome aboard Plane!</h1>- <Image src={PlaneTakeOffImage} alt="Plane Logo" />- <p className="font-medium text-base text-onboarding-text-400">- Get started by setting up your instance and workspace- </p>- </div>- <div>- <a href={GOD_MODE_URL}>- <Button size="lg" className="w-full">- Get started- </Button>- </a>- </div>- </div>- </div>- </div>- </div>- </div>- );-};diff --git a/space/components/issues/board-views/block-downvotes.tsx b/space/components/issues/board-views/block-downvotes.tsxdeleted file mode 100644index 4326a88230..0000000000--- a/space/components/issues/board-views/block-downvotes.tsx+++ /dev/null@@ -1,10 +0,0 @@-"use client";--export const IssueBlockDownVotes = ({ number }: { number: number }) => (- <div className="flex h-6 items-center rounded border-[0.5px] border-custom-border-300 px-1.5 py-1 pl-1 text-xs text-custom-text-300">- <span className="material-symbols-rounded !m-0 rotate-180 !p-0 text-base text-custom-text-300">- arrow_upward_alt- </span>- {number}- </div>-);diff --git a/space/components/issues/board-views/block-due-date.tsx b/space/components/issues/board-views/block-due-date.tsxdeleted file mode 100644index ecf2295621..0000000000--- a/space/components/issues/board-views/block-due-date.tsx+++ /dev/null@@ -1,59 +0,0 @@-"use client";--// helpers-import { renderFullDate } from "@/helpers/date-time.helper";--export const dueDateIconDetails = (- date: string,- stateGroup: string-): {- iconName: string;- className: string;-} => {- let iconName = "calendar_today";- let className = "";-- if (!date || ["completed", "cancelled"].includes(stateGroup)) {- iconName = "calendar_today";- className = "";- } else {- const today = new Date();- today.setHours(0, 0, 0, 0);- const targetDate = new Date(date);- targetDate.setHours(0, 0, 0, 0);-- const timeDifference = targetDate.getTime() - today.getTime();-- if (timeDifference < 0) {- iconName = "event_busy";- className = "text-red-500";- } else if (timeDifference === 0) {- iconName = "today";- className = "text-red-500";- } else if (timeDifference === 24 * 60 * 60 * 1000) {- iconName = "event";- className = "text-yellow-500";- } else {- iconName = "calendar_today";- className = "";- }- }-- return {- iconName,- className,- };-};--export const IssueBlockDueDate = ({ due_date, group }: { due_date: string; group: string }) => {- const iconDetails = dueDateIconDetails(due_date, group);-- return (- <div className="flex items-center gap-1 rounded border-[0.5px] border-custom-border-300 px-2.5 py-1 text-xs text-custom-text-100">- <span className={`material-symbols-rounded -my-0.5 text-sm ${iconDetails.className}`}>- {iconDetails.iconName}- </span>- {renderFullDate(due_date)}- </div>- );-};diff --git a/space/components/issues/board-views/block-labels.tsx b/space/components/issues/board-views/block-labels.tsxdeleted file mode 100644index 05f6a039f8..0000000000--- a/space/components/issues/board-views/block-labels.tsx+++ /dev/null@@ -1,19 +0,0 @@-"use client";--export const IssueBlockLabels = ({ labels }: any) => (- <div className="relative flex flex-wrap items-center gap-1">- {labels &&- labels.length > 0 &&- labels.map((_label: any) => (- <div- key={_label?.id}- className="flex flex-shrink-0 cursor-default items-center rounded-md border border-custom-border-300 px-2.5 py-1 text-xs shadow-sm"- >- <div className="flex items-center gap-1.5 text-custom-text-200">- <div className="h-2 w-2 rounded-full" style={{ backgroundColor: `${_label?.color}` }} />- <div className="text-xs">{_label?.name}</div>- </div>- </div>- ))}- </div>-);diff --git a/space/components/issues/board-views/block-state.tsx b/space/components/issues/board-views/block-state.tsxdeleted file mode 100644index 39b10ceb03..0000000000--- a/space/components/issues/board-views/block-state.tsx+++ /dev/null@@ -1,18 +0,0 @@-// ui-import { StateGroupIcon } from "@plane/ui";-// constants-import { issueGroupFilter } from "@/constants/issue";--export const IssueBlockState = ({ state }: any) => {- const stateGroup = issueGroupFilter(state.group);-- if (stateGroup === null) return <></>;- return (- <div className="flex w-full items-center justify-between gap-1 rounded border-[0.5px] border-custom-border-300 px-2.5 py-1 text-xs shadow-sm duration-300 focus:outline-none">- <div className="flex w-full items-center gap-1.5 text-custom-text-200">- <StateGroupIcon stateGroup={state.group} color={state.color} />- <div className="text-xs">{state?.name}</div>- </div>- </div>- );-};diff --git a/space/components/issues/board-views/block-upvotes.tsx b/space/components/issues/board-views/block-upvotes.tsxdeleted file mode 100644index 3927acac49..0000000000--- a/space/components/issues/board-views/block-upvotes.tsx+++ /dev/null@@ -1,8 +0,0 @@-"use client";--export const IssueBlockUpVotes = ({ number }: { number: number }) => (- <div className="flex h-6 items-center rounded border-[0.5px] border-custom-border-300 px-1.5 py-1 pl-1 text-xs text-custom-text-300">- <span className="material-symbols-rounded !m-0 !p-0 text-base text-custom-text-300">arrow_upward_alt</span>- {number}- </div>-);diff --git a/space/components/issues/board-views/calendar/index.tsx b/space/components/issues/board-views/calendar/index.tsxdeleted file mode 100644index 0edeca96c4..0000000000--- a/space/components/issues/board-views/calendar/index.tsx+++ /dev/null@@ -1 +0,0 @@-export const IssueCalendarView = () => <div> </div>;diff --git a/space/components/issues/board-views/gantt/index.tsx b/space/components/issues/board-views/gantt/index.tsxdeleted file mode 100644index 5da924b2c8..0000000000--- a/space/components/issues/board-views/gantt/index.tsx+++ /dev/null@@ -1 +0,0 @@-export const IssueGanttView = () => <div> </div>;diff --git a/space/components/issues/board-views/kanban/block.tsx b/space/components/issues/board-views/kanban/block.tsxdeleted file mode 100644index e34222dd47..0000000000--- a/space/components/issues/board-views/kanban/block.tsx+++ /dev/null@@ -1,82 +0,0 @@-"use client";--import { FC } from "react";-import { observer } from "mobx-react-lite";-import { useRouter, useSearchParams } from "next/navigation";-// components-import { IssueBlockDueDate } from "@/components/issues/board-views/block-due-date";-import { IssueBlockPriority } from "@/components/issues/board-views/block-priority";-import { IssueBlockState } from "@/components/issues/board-views/block-state";-// helpers-import { queryParamGenerator } from "@/helpers/query-param-generator";-// hooks-import { useIssueDetails, useProject } from "@/hooks/store";-// interfaces-import { IIssue } from "@/types/issue";--type IssueKanBanBlockProps = {- issue: IIssue;- workspaceSlug: string;- projectId: string;- params: any;-};--export const IssueKanBanBlock: FC<IssueKanBanBlockProps> = observer((props) => {- const router = useRouter();- const searchParams = useSearchParams();- // query params- const board = searchParams.get("board") || undefined;- const state = searchParams.get("state") || undefined;- const priority = searchParams.get("priority") || undefined;- const labels = searchParams.get("labels") || undefined;- // props- const { workspaceSlug, projectId, issue } = props;- // hooks- const { project } = useProject();- const { setPeekId } = useIssueDetails();-- const handleBlockClick = () => {- setPeekId(issue.id);- const { queryParam } = queryParamGenerator({ board, peekId: issue.id, priority, state, labels });- router.push(`/${workspaceSlug}/${projectId}?${queryParam}`);- };-- return (- <div className="flex flex-col gap-1.5 space-y-2 rounded border-[0.5px] border-custom-border-200 bg-custom-background-100 px-3 py-2 text-sm shadow-custom-shadow-2xs">- {/* id */}- <div className="break-words text-xs text-custom-text-300">- {project?.identifier}-{issue?.sequence_id}- </div>-- {/* name */}- <h6- onClick={handleBlockClick}- role="button"- className="line-clamp-2 cursor-pointer break-words text-sm font-medium"- >- {issue.name}- </h6>-- <div className="hide-horizontal-scrollbar relative flex w-full flex-grow items-end gap-2 overflow-x-scroll">- {/* priority */}- {issue?.priority && (- <div className="flex-shrink-0">- <IssueBlockPriority priority={issue?.priority} />- </div>- )}- {/* state */}- {issue?.state_detail && (- <div className="flex-shrink-0">- <IssueBlockState state={issue?.state_detail} />- </div>- )}- {/* due date */}- {issue?.target_date && (- <div className="flex-shrink-0">- <IssueBlockDueDate due_date={issue?.target_date} group={issue?.state_detail?.group} />- </div>- )}- </div>- </div>- );-});diff --git a/space/components/issues/board-views/kanban/header.tsx b/space/components/issues/board-views/kanban/header.tsxdeleted file mode 100644index baf5612b3d..0000000000--- a/space/components/issues/board-views/kanban/header.tsx+++ /dev/null@@ -1,28 +0,0 @@-"use client";-// mobx react lite-import { observer } from "mobx-react-lite";-// ui-import { StateGroupIcon } from "@plane/ui";-// constants-import { issueGroupFilter } from "@/constants/issue";-// mobx hook-// import { useIssue } from "@/hooks/store";-// interfaces-import { IIssueState } from "@/types/issue";--export const IssueKanBanHeader = observer(({ state }: { state: IIssueState }) => {- // const { getCountOfIssuesByState } = useIssue();- const stateGroup = issueGroupFilter(state.group);-- if (stateGroup === null) return <></>;-- return (- <div className="flex items-center gap-2 px-2 pb-2">- <div className="flex h-3.5 w-3.5 flex-shrink-0 items-center justify-center">- <StateGroupIcon stateGroup={state.group} color={state.color} height="14" width="14" />- </div>- <div className="mr-1 truncate font-semibold capitalize text-custom-text-200">{state?.name}</div>- {/* <span className="flex-shrink-0 rounded-full text-custom-text-300">{getCountOfIssuesByState(state.id)}</span> */}- </div>- );-});diff --git a/space/components/issues/board-views/kanban/index.tsx b/space/components/issues/board-views/kanban/index.tsxdeleted file mode 100644index e2e4e9900c..0000000000--- a/space/components/issues/board-views/kanban/index.tsx+++ /dev/null@@ -1,58 +0,0 @@-"use client";--import { FC } from "react";-import { observer } from "mobx-react-lite";-// components-import { IssueKanBanBlock } from "@/components/issues/board-views/kanban/block";-import { IssueKanBanHeader } from "@/components/issues/board-views/kanban/header";-// ui-import { Icon } from "@/components/ui";-// mobx hook-import { useIssue } from "@/hooks/store";-// interfaces-import { IIssueState, IIssue } from "@/types/issue";--type IssueKanbanViewProps = {- workspaceSlug: string;- projectId: string;-};--export const IssueKanbanView: FC<IssueKanbanViewProps> = observer((props) => {- const { workspaceSlug, projectId } = props;- // store hooks- const { states, getFilteredIssuesByState } = useIssue();-- return (- <div className="relative flex h-full w-full gap-3 overflow-hidden overflow-x-auto">- {states &&- states.length > 0 &&- states.map((_state: IIssueState) => (- <div key={_state.id} className="relative flex h-full w-[340px] flex-shrink-0 flex-col">- <div className="flex-shrink-0">- <IssueKanBanHeader state={_state} />- </div>- <div className="hide-vertical-scrollbar h-full w-full overflow-hidden overflow-y-auto">- {getFilteredIssuesByState(_state.id) && getFilteredIssuesByState(_state.id).length > 0 ? (- <div className="space-y-3 px-2 pb-2">- {getFilteredIssuesByState(_state.id).map((_issue: IIssue) => (- <IssueKanBanBlock- key={_issue.id}- issue={_issue}- workspaceSlug={workspaceSlug}- projectId={projectId}- params={{}}- />- ))}- </div>- ) : (- <div className="flex items-center justify-center gap-2 pt-10 text-center text-sm font-medium text-custom-text-200">- <Icon iconName="stack" />- No issues in this state- </div>- )}- </div>- </div>- ))}- </div>- );-});diff --git a/space/components/issues/board-views/list/index.tsx b/space/components/issues/board-views/list/index.tsxdeleted file mode 100644index 2a2b958be7..0000000000--- a/space/components/issues/board-views/list/index.tsx+++ /dev/null@@ -1,42 +0,0 @@-"use client";-import { FC } from "react";-import { observer } from "mobx-react-lite";-// components-import { IssueListBlock } from "@/components/issues/board-views/list/block";-import { IssueListHeader } from "@/components/issues/board-views/list/header";-// mobx hook-import { useIssue } from "@/hooks/store";-// types-import { IIssueState, IIssue } from "@/types/issue";--type IssueListViewProps = {- workspaceSlug: string;- projectId: string;-};--export const IssueListView: FC<IssueListViewProps> = observer((props) => {- const { workspaceSlug, projectId } = props;- // store hooks- const { states, getFilteredIssuesByState } = useIssue();-- return (- <>- {states &&- states.length > 0 &&- states.map((_state: IIssueState) => (- <div key={_state.id} className="relative w-full">- <IssueListHeader state={_state} />- {getFilteredIssuesByState(_state.id) && getFilteredIssuesByState(_state.id).length > 0 ? (- <div className="divide-y divide-custom-border-200">- {getFilteredIssuesByState(_state.id).map((_issue: IIssue) => (- <IssueListBlock key={_issue.id} issue={_issue} workspaceSlug={workspaceSlug} projectId={projectId} />- ))}- </div>- ) : (- <div className="bg-custom-background-100 p-3 text-sm text-custom-text-400">No issues.</div>- )}- </div>- ))}- </>- );-});diff --git a/space/components/issues/board-views/spreadsheet/index.tsx b/space/components/issues/board-views/spreadsheet/index.tsxdeleted file mode 100644index 45ebf27928..0000000000--- a/space/components/issues/board-views/spreadsheet/index.tsx+++ /dev/null@@ -1 +0,0 @@-export const IssueSpreadsheetView = () => <div> </div>;diff --git a/space/components/issues/filters/applied-filters/filters-list.tsx b/space/components/issues/filters/applied-filters/filters-list.tsxindex 83d651f5d2..87089c500a 100644--- a/space/components/issues/filters/applied-filters/filters-list.tsx+++ b/space/components/issues/filters/applied-filters/filters-list.tsx@@ -1,10 +1,10 @@"use client";-// iconsimport { observer } from "mobx-react-lite";import { X } from "lucide-react";// types-import { IIssueLabel, IIssueState, TFilters } from "@/types/issue";+import { IStateLite } from "@plane/types";+import { IIssueLabel, TFilters } from "@/types/issue";// componentsimport { AppliedPriorityFilters } from "./priority";import { AppliedStateFilters } from "./state";@@ -14,7 +14,7 @@ type Props = {handleRemoveAllFilters: () => void;handleRemoveFilter: (key: keyof TFilters, value: string | null) => void;labels?: IIssueLabel[] | undefined;- states?: IIssueState[] | undefined;+ states?: IStateLite[] | undefined;};export const replaceUnderscoreIfSnakeCase = (str: string) => str.replace(/_/g, " ");diff --git a/space/components/issues/filters/applied-filters/root.tsx b/space/components/issues/filters/applied-filters/root.tsxindex 9dd1eb0135..9b6625d752 100644--- a/space/components/issues/filters/applied-filters/root.tsx+++ b/space/components/issues/filters/applied-filters/root.tsx@@ -12,18 +12,18 @@ import { TIssueQueryFilters } from "@/types/issue";import { AppliedFiltersList } from "./filters-list";type TIssueAppliedFilters = {- workspaceSlug: string;- projectId: string;+ anchor: string;};export const IssueAppliedFilters: FC<TIssueAppliedFilters> = observer((props) => {+ const { anchor } = props;+ // routerconst router = useRouter();- // props- const { workspaceSlug, projectId } = props;- // hooks- const { issueFilters, initIssueFilters, updateIssueFilters } = useIssueFilter();+ // store hooks+ const { getIssueFilters, initIssueFilters, updateIssueFilters } = useIssueFilter();const { states, labels } = useIssue();-+ // derived values+ const issueFilters = getIssueFilters(anchor);const activeLayout = issueFilters?.display_filters?.layout || undefined;const userFilters = issueFilters?.filters || {};@@ -46,30 +46,26 @@ export const IssueAppliedFilters: FC<TIssueAppliedFilters> = observer((props) =>if (labels.length > 0) params = { ...params, labels: labels.join(",") };params = new URLSearchParams(params).toString();- router.push(`/${workspaceSlug}/${projectId}?${params}`);+ router.push(`/issues/${anchor}?${params}`);},- [workspaceSlug, projectId, activeLayout, issueFilters, router]+ [activeLayout, anchor, issueFilters, router]);const handleFilters = useCallback((key: keyof TIssueQueryFilters, value: string | null) => {- if (!projectId) return;-let newValues = cloneDeep(issueFilters?.filters?.[key]) ?? [];if (value === null) newValues = [];else if (newValues.includes(value)) newValues.splice(newValues.indexOf(value), 1);- updateIssueFilters(projectId, "filters", key, newValues);+ updateIssueFilters(anchor, "filters", key, newValues);updateRouteParams(key, newValues);},- [projectId, issueFilters, updateIssueFilters, updateRouteParams]+ [anchor, issueFilters, updateIssueFilters, updateRouteParams]);const handleRemoveAllFilters = () => {- if (!projectId) return;-- initIssueFilters(projectId, {+ initIssueFilters(anchor, {display_filters: { layout: activeLayout || "list" },filters: {state: [],@@ -78,13 +74,13 @@ export const IssueAppliedFilters: FC<TIssueAppliedFilters> = observer((props) =>},});- router.push(`/${workspaceSlug}/${projectId}?${`board=${activeLayout || "list"}`}`);+ router.push(`/issues/${anchor}?${`board=${activeLayout || "list"}`}`);};if (Object.keys(appliedFilters).length === 0) return null;return (- <div className="border-b border-custom-border-200 p-5 py-3">+ <div className="border-b border-custom-border-200 bg-custom-background-100 p-4"><AppliedFiltersListappliedFilters={appliedFilters || {}}handleRemoveFilter={handleFilters as any}diff --git a/space/components/issues/filters/applied-filters/state.tsx b/space/components/issues/filters/applied-filters/state.tsxindex 9af19b6e6b..064b36aee1 100644--- a/space/components/issues/filters/applied-filters/state.tsx+++ b/space/components/issues/filters/applied-filters/state.tsx@@ -2,13 +2,14 @@import { observer } from "mobx-react-lite";import { X } from "lucide-react";-import { StateGroupIcon } from "@plane/ui";// types-import { IIssueState } from "@/types/issue";+import { IStateLite } from "@plane/types";+// ui+import { StateGroupIcon } from "@plane/ui";type Props = {handleRemove: (val: string) => void;- states: IIssueState[];+ states: IStateLite[];values: string[];};diff --git a/space/components/issues/filters/root.tsx b/space/components/issues/filters/root.tsxindex de972ea8aa..dba13f9fbd 100644--- a/space/components/issues/filters/root.tsx+++ b/space/components/issues/filters/root.tsx@@ -17,17 +17,18 @@ import { useIssue, useIssueFilter } from "@/hooks/store";import { TIssueQueryFilters } from "@/types/issue";type IssueFiltersDropdownProps = {- workspaceSlug: string;- projectId: string;+ anchor: string;};export const IssueFiltersDropdown: FC<IssueFiltersDropdownProps> = observer((props) => {+ const { anchor } = props;+ // routerconst router = useRouter();- const { workspaceSlug, projectId } = props;// hooks- const { issueFilters, updateIssueFilters } = useIssueFilter();+ const { getIssueFilters, updateIssueFilters } = useIssueFilter();const { states, labels } = useIssue();-+ // derived values+ const issueFilters = getIssueFilters(anchor);const activeLayout = issueFilters?.display_filters?.layout || undefined;const updateRouteParams = useCallback(@@ -37,24 +38,24 @@ export const IssueFiltersDropdown: FC<IssueFiltersDropdownProps> = observer((proconst labels = key === "labels" ? value : issueFilters?.filters?.labels ?? [];const { queryParam } = queryParamGenerator({ board: activeLayout, priority, state, labels });- router.push(`/${workspaceSlug}/${projectId}?${queryParam}`);+ router.push(`/issues/${anchor}?${queryParam}`);},- [workspaceSlug, projectId, activeLayout, issueFilters, router]+ [anchor, activeLayout, issueFilters, router]);const handleFilters = useCallback((key: keyof TIssueQueryFilters, value: string) => {- if (!projectId || !value) return;+ if (!value) return;const newValues = cloneDeep(issueFilters?.filters?.[key]) ?? [];if (newValues.includes(value)) newValues.splice(newValues.indexOf(value), 1);else newValues.push(value);- updateIssueFilters(projectId, "filters", key, newValues);+ updateIssueFilters(anchor, "filters", key, newValues);updateRouteParams(key, newValues);},- [projectId, issueFilters, updateIssueFilters, updateRouteParams]+ [anchor, issueFilters, updateIssueFilters, updateRouteParams]);return (diff --git a/space/components/issues/filters/selection.tsx b/space/components/issues/filters/selection.tsxindex a1180b0ee6..926fbf5b08 100644--- a/space/components/issues/filters/selection.tsx+++ b/space/components/issues/filters/selection.tsx@@ -4,7 +4,8 @@ import React, { useState } from "react";import { observer } from "mobx-react-lite";import { Search, X } from "lucide-react";// types-import { IIssueState, IIssueLabel, IIssueFilterOptions, TIssueFilterKeys } from "@/types/issue";+import { IStateLite } from "@plane/types";+import { IIssueLabel, IIssueFilterOptions, TIssueFilterKeys } from "@/types/issue";// componentsimport { FilterPriority, FilterState } from "./";@@ -13,7 +14,7 @@ type Props = {handleFilters: (key: keyof IIssueFilterOptions, value: string | string[]) => void;layoutDisplayFiltersOptions: TIssueFilterKeys[];labels?: IIssueLabel[] | undefined;- states?: IIssueState[] | undefined;+ states?: IStateLite[] | undefined;};export const FilterSelection: React.FC<Props> = observer((props) => {diff --git a/space/components/issues/filters/state.tsx b/space/components/issues/filters/state.tsxindex 24b6bb5c86..f61237eef2 100644--- a/space/components/issues/filters/state.tsx+++ b/space/components/issues/filters/state.tsx@@ -1,17 +1,18 @@"use client";import React, { useState } from "react";+// types+import { IStateLite } from "@plane/types";+// uiimport { Loader, StateGroupIcon } from "@plane/ui";// componentsimport { FilterHeader, FilterOption } from "@/components/issues/filters/helpers";-// types-import { IIssueState } from "@/types/issue";type Props = {appliedFilters: string[] | null;handleUpdate: (val: string) => void;searchQuery: string;- states: IIssueState[] | undefined;+ states: IStateLite[] | undefined;};export const FilterState: React.FC<Props> = (props) => {diff --git a/space/components/issues/index.ts b/space/components/issues/index.tsnew file mode 100644index 0000000000..6aee62097e--- /dev/null+++ b/space/components/issues/index.ts@@ -0,0 +1,2 @@+export * from "./issue-layouts";+export * from "./navbar";diff --git a/space/components/issues/issue-layouts/index.ts b/space/components/issues/issue-layouts/index.tsnew file mode 100644index 0000000000..5ab6813cdf--- /dev/null+++ b/space/components/issues/issue-layouts/index.ts@@ -0,0 +1,4 @@+export * from "./kanban";+export * from "./list";+export * from "./properties";+export * from "./root";diff --git a/space/components/issues/issue-layouts/kanban/block.tsx b/space/components/issues/issue-layouts/kanban/block.tsxnew file mode 100644index 0000000000..ac03823b4c--- /dev/null+++ b/space/components/issues/issue-layouts/kanban/block.tsx@@ -0,0 +1,78 @@+"use client";++import { FC } from "react";+import { observer } from "mobx-react-lite";+import Link from "next/link";+import { useSearchParams } from "next/navigation";+// components+import { IssueBlockDueDate, IssueBlockPriority, IssueBlockState } from "@/components/issues";+// helpers+import { queryParamGenerator } from "@/helpers/query-param-generator";+// hooks+import { useIssueDetails, usePublish } from "@/hooks/store";+// interfaces+import { IIssue } from "@/types/issue";++type Props = {+ anchor: string;+ issue: IIssue;+ params: any;+};++export const IssueKanBanBlock: FC<Props> = observer((props) => {+ const { anchor, issue } = props;+ const searchParams = useSearchParams();+ // query params+ const board = searchParams.get("board");+ const state = searchParams.get("state");+ const priority = searchParams.get("priority");+ const labels = searchParams.get("labels");+ // store hooks+ const { project_details } = usePublish(anchor);+ const { setPeekId } = useIssueDetails();++ const { queryParam } = queryParamGenerator({ board, peekId: issue.id, priority, state, labels });++ const handleBlockClick = () => {+ setPeekId(issue.id);+ };++ return (+ <Link+ href={`/issues/${anchor}?${queryParam}`}+ onClick={handleBlockClick}+ className="flex flex-col gap-1.5 space-y-2 rounded border-[0.5px] border-custom-border-200 bg-custom-background-100 px-3 py-2 text-sm shadow-custom-shadow-2xs select-none"+ >+ {/* id */}+ <div className="break-words text-xs text-custom-text-300">+ {project_details?.identifier}-{issue?.sequence_id}+ </div>++ {/* name */}+ <h6 role="button" className="line-clamp-2 cursor-pointer break-words text-sm">+ {issue.name}+ </h6>++ <div className="hide-horizontal-scrollbar relative flex w-full flex-grow items-end gap-2 overflow-x-scroll">+ {/* priority */}+ {issue?.priority && (+ <div className="flex-shrink-0">+ <IssueBlockPriority priority={issue?.priority} />+ </div>+ )}+ {/* state */}+ {issue?.state_detail && (+ <div className="flex-shrink-0">+ <IssueBlockState state={issue?.state_detail} />+ </div>+ )}+ {/* due date */}+ {issue?.target_date && (+ <div className="flex-shrink-0">+ <IssueBlockDueDate due_date={issue?.target_date} group={issue?.state_detail?.group} />+ </div>+ )}+ </div>+ </Link>+ );+});diff --git a/space/components/issues/issue-layouts/kanban/header.tsx b/space/components/issues/issue-layouts/kanban/header.tsxnew file mode 100644index 0000000000..ee5433d68f--- /dev/null+++ b/space/components/issues/issue-layouts/kanban/header.tsx@@ -0,0 +1,25 @@+"use client";++import { observer } from "mobx-react-lite";+// types+import { IStateLite } from "@plane/types";+// ui+import { StateGroupIcon } from "@plane/ui";++type Props = {+ state: IStateLite;+};++export const IssueKanBanHeader: React.FC<Props> = observer((props) => {+ const { state } = props;++ return (+ <div className="flex items-center gap-2 px-2 pb-2">+ <div className="flex h-3.5 w-3.5 flex-shrink-0 items-center justify-center">+ <StateGroupIcon stateGroup={state.group} color={state.color} height="14" width="14" />+ </div>+ <div className="mr-1 truncate font-medium capitalize text-custom-text-200">{state?.name}</div>+ {/* <span className="flex-shrink-0 rounded-full text-custom-text-300">{getCountOfIssuesByState(state.id)}</span> */}+ </div>+ );+});diff --git a/space/components/issues/issue-layouts/kanban/index.ts b/space/components/issues/issue-layouts/kanban/index.tsnew file mode 100644index 0000000000..62874fbda4--- /dev/null+++ b/space/components/issues/issue-layouts/kanban/index.ts@@ -0,0 +1,3 @@+export * from "./block";+export * from "./header";+export * from "./root";diff --git a/space/components/issues/issue-layouts/kanban/root.tsx b/space/components/issues/issue-layouts/kanban/root.tsxnew file mode 100644index 0000000000..e0a5593e9f--- /dev/null+++ b/space/components/issues/issue-layouts/kanban/root.tsx@@ -0,0 +1,50 @@+"use client";++import { FC } from "react";+import { observer } from "mobx-react-lite";+// components+import { IssueKanBanBlock, IssueKanBanHeader } from "@/components/issues";+// ui+import { Icon } from "@/components/ui";+// mobx hook+import { useIssue } from "@/hooks/store";++type Props = {+ anchor: string;+};++export const IssueKanbanLayoutRoot: FC<Props> = observer((props) => {+ const { anchor } = props;+ // store hooks+ const { states, getFilteredIssuesByState } = useIssue();++ return (+ <div className="relative flex h-full w-full gap-3 overflow-hidden overflow-x-auto">+ {states?.map((state) => {+ const issues = getFilteredIssuesByState(state.id);++ return (+ <div key={state.id} className="relative flex h-full w-[340px] flex-shrink-0 flex-col">+ <div className="flex-shrink-0">+ <IssueKanBanHeader state={state} />+ </div>+ <div className="hide-vertical-scrollbar h-full w-full overflow-hidden overflow-y-auto">+ {issues && issues.length > 0 ? (+ <div className="space-y-3 px-2 pb-2">+ {issues.map((issue) => (+ <IssueKanBanBlock key={issue.id} anchor={anchor} issue={issue} params={{}} />+ ))}+ </div>+ ) : (+ <div className="flex items-center justify-center gap-2 pt-10 text-center text-sm font-medium text-custom-text-200">+ <Icon iconName="stack" />+ No issues in this state+ </div>+ )}+ </div>+ </div>+ );+ })}+ </div>+ );+});diff --git a/space/components/issues/board-views/list/block.tsx b/space/components/issues/issue-layouts/list/block.tsxsimilarity index 64%rename from space/components/issues/board-views/list/block.tsxrename to space/components/issues/issue-layouts/list/block.tsxindex 6b6231fcf5..8c241753de 100644--- a/space/components/issues/board-views/list/block.tsx+++ b/space/components/issues/issue-layouts/list/block.tsx@@ -1,56 +1,52 @@"use client";import { FC } from "react";import { observer } from "mobx-react-lite";-import { useRouter, useSearchParams } from "next/navigation";+import Link from "next/link";+import { useSearchParams } from "next/navigation";// components-import { IssueBlockDueDate } from "@/components/issues/board-views/block-due-date";-import { IssueBlockLabels } from "@/components/issues/board-views/block-labels";-import { IssueBlockPriority } from "@/components/issues/board-views/block-priority";-import { IssueBlockState } from "@/components/issues/board-views/block-state";+import { IssueBlockDueDate, IssueBlockLabels, IssueBlockPriority, IssueBlockState } from "@/components/issues";// helpersimport { queryParamGenerator } from "@/helpers/query-param-generator";// hook-import { useIssueDetails, useProject } from "@/hooks/store";-// interfaces+import { useIssueDetails, usePublish } from "@/hooks/store";+// typesimport { IIssue } from "@/types/issue";-// storetype IssueListBlockProps = {+ anchor: string;issue: IIssue;- workspaceSlug: string;- projectId: string;};-export const IssueListBlock: FC<IssueListBlockProps> = observer((props) => {- const { workspaceSlug, projectId, issue } = props;- const searchParams = useSearchParams();+export const IssueListLayoutBlock: FC<IssueListBlockProps> = observer((props) => {+ const { anchor, issue } = props;// query params+ const searchParams = useSearchParams();const board = searchParams.get("board") || undefined;const state = searchParams.get("state") || undefined;const priority = searchParams.get("priority") || undefined;const labels = searchParams.get("labels") || undefined;- // store- const { project } = useProject();+ // store hooksconst { setPeekId } = useIssueDetails();- // router- const router = useRouter();+ const { project_details } = usePublish(anchor);+ const { queryParam } = queryParamGenerator({ board, peekId: issue.id, priority, state, labels });const handleBlockClick = () => {setPeekId(issue.id);-- const { queryParam } = queryParamGenerator({ board, peekId: issue.id, priority, state, labels });- router.push(`/${workspaceSlug}/${projectId}?${queryParam}`);};return (- <div className="relative flex items-center gap-10 bg-custom-background-100 p-3">+ <Link+ href={`/issues/${anchor}?${queryParam}`}+ onClick={handleBlockClick}+ className="relative flex items-center gap-10 bg-custom-background-100 p-3"+ ><div className="relative flex w-full flex-grow items-center gap-3 overflow-hidden">{/* id */}<div className="flex-shrink-0 text-xs font-medium text-custom-text-300">- {project?.identifier}-{issue?.sequence_id}+ {project_details?.identifier}-{issue?.sequence_id}</div>{/* name */}- <div onClick={handleBlockClick} className="flex-grow cursor-pointer truncate text-sm font-medium">+ <div onClick={handleBlockClick} className="flex-grow cursor-pointer truncate text-sm">{issue.name}</div></div>@@ -84,6 +80,6 @@ export const IssueListBlock: FC<IssueListBlockProps> = observer((props) => {</div>)}</div>- </div>+ </Link>);});diff --git a/space/components/issues/board-views/list/header.tsx b/space/components/issues/issue-layouts/list/header.tsxsimilarity index 54%rename from space/components/issues/board-views/list/header.tsxrename to space/components/issues/issue-layouts/list/header.tsxindex 2f8f6c018e..a038050a9a 100644--- a/space/components/issues/board-views/list/header.tsx+++ b/space/components/issues/issue-layouts/list/header.tsx@@ -1,20 +1,18 @@"use client";++import React from "react";import { observer } from "mobx-react-lite";+// types+import { IStateLite } from "@plane/types";// uiimport { StateGroupIcon } from "@plane/ui";-// constants-import { issueGroupFilter } from "@/constants/issue";-// mobx hook-// import { useIssue } from "@/hooks/store";-// types-import { IIssueState } from "@/types/issue";-export const IssueListHeader = observer(({ state }: { state: IIssueState }) => {- // const { getCountOfIssuesByState } = useIssue();- const stateGroup = issueGroupFilter(state.group);- // const count = getCountOfIssuesByState(state.id);+type Props = {+ state: IStateLite;+};- if (stateGroup === null) return <></>;+export const IssueListLayoutHeader: React.FC<Props> = observer((props) => {+ const { state } = props;return (<div className="flex items-center gap-2 p-3">diff --git a/space/components/issues/issue-layouts/list/index.ts b/space/components/issues/issue-layouts/list/index.tsnew file mode 100644index 0000000000..62874fbda4--- /dev/null+++ b/space/components/issues/issue-layouts/list/index.ts@@ -0,0 +1,3 @@+export * from "./block";+export * from "./header";+export * from "./root";diff --git a/space/components/issues/issue-layouts/list/root.tsx b/space/components/issues/issue-layouts/list/root.tsxnew file mode 100644index 0000000000..02cd25b40b--- /dev/null+++ b/space/components/issues/issue-layouts/list/root.tsx@@ -0,0 +1,40 @@+"use client";+import { FC } from "react";+import { observer } from "mobx-react-lite";+// components+import { IssueListLayoutBlock, IssueListLayoutHeader } from "@/components/issues";+// mobx hook+import { useIssue } from "@/hooks/store";++type Props = {+ anchor: string;+};++export const IssuesListLayoutRoot: FC<Props> = observer((props) => {+ const { anchor } = props;+ // store hooks+ const { states, getFilteredIssuesByState } = useIssue();++ return (+ <>+ {states?.map((state) => {+ const issues = getFilteredIssuesByState(state.id);++ return (+ <div key={state.id} className="relative w-full">+ <IssueListLayoutHeader state={state} />+ {issues && issues.length > 0 ? (+ <div className="divide-y divide-custom-border-200">+ {issues.map((issue) => (+ <IssueListLayoutBlock key={issue.id} anchor={anchor} issue={issue} />+ ))}+ </div>+ ) : (+ <div className="bg-custom-background-100 p-3 text-sm text-custom-text-400">No issues.</div>+ )}+ </div>+ );+ })}+ </>+ );+});diff --git a/space/components/issues/issue-layouts/properties/due-date.tsx b/space/components/issues/issue-layouts/properties/due-date.tsxnew file mode 100644index 0000000000..3b73973e72--- /dev/null+++ b/space/components/issues/issue-layouts/properties/due-date.tsx@@ -0,0 +1,32 @@+"use client";++import { CalendarCheck2 } from "lucide-react";+// types+import { TStateGroups } from "@plane/types";+// helpers+import { cn } from "@/helpers/common.helper";+import { renderFormattedDate } from "@/helpers/date-time.helper";+import { shouldHighlightIssueDueDate } from "@/helpers/issue.helper";++type Props = {+ due_date: string;+ group: TStateGroups;+};++export const IssueBlockDueDate = (props: Props) => {+ const { due_date, group } = props;++ return (+ <div+ className={cn(+ "flex items-center gap-1 rounded border-[0.5px] border-custom-border-300 px-2.5 py-1 text-xs text-custom-text-100",+ {+ "text-red-500": shouldHighlightIssueDueDate(due_date, group),+ }+ )}+ >+ <CalendarCheck2 className="size-3 flex-shrink-0" />+ {renderFormattedDate(due_date)}+ </div>+ );+};diff --git a/space/components/issues/issue-layouts/properties/index.ts b/space/components/issues/issue-layouts/properties/index.tsnew file mode 100644index 0000000000..de78f99669--- /dev/null+++ b/space/components/issues/issue-layouts/properties/index.ts@@ -0,0 +1,4 @@+export * from "./due-date";+export * from "./labels";+export * from "./priority";+export * from "./state";diff --git a/space/components/issues/issue-layouts/properties/labels.tsx b/space/components/issues/issue-layouts/properties/labels.tsxnew file mode 100644index 0000000000..75c32c4a03--- /dev/null+++ b/space/components/issues/issue-layouts/properties/labels.tsx@@ -0,0 +1,17 @@+"use client";++export const IssueBlockLabels = ({ labels }: any) => (+ <div className="relative flex flex-wrap items-center gap-1">+ {labels?.map((_label: any) => (+ <div+ key={_label?.id}+ className="flex flex-shrink-0 cursor-default items-center rounded-md border border-custom-border-300 px-2.5 py-1 text-xs shadow-sm"+ >+ <div className="flex items-center gap-1.5 text-custom-text-200">+ <div className="h-2 w-2 rounded-full" style={{ backgroundColor: `${_label?.color}` }} />+ <div className="text-xs">{_label?.name}</div>+ </div>+ </div>+ ))}+ </div>+);diff --git a/space/components/issues/board-views/block-priority.tsx b/space/components/issues/issue-layouts/properties/priority.tsxsimilarity index 85%rename from space/components/issues/board-views/block-priority.tsxrename to space/components/issues/issue-layouts/properties/priority.tsxindex 3110930ec0..b91d56bb87 100644--- a/space/components/issues/board-views/block-priority.tsx+++ b/space/components/issues/issue-layouts/properties/priority.tsx@@ -1,11 +1,11 @@"use client";// types-import { issuePriorityFilter } from "@/constants/issue";-import { TIssueFilterPriority } from "@/types/issue";+import { TIssuePriorities } from "@plane/types";// constants+import { issuePriorityFilter } from "@/constants/issue";-export const IssueBlockPriority = ({ priority }: { priority: TIssueFilterPriority | null }) => {+export const IssueBlockPriority = ({ priority }: { priority: TIssuePriorities | null }) => {const priority_detail = priority != null ? issuePriorityFilter(priority) : null;if (priority_detail === null) return <></>;diff --git a/space/components/issues/issue-layouts/properties/state.tsx b/space/components/issues/issue-layouts/properties/state.tsxnew file mode 100644index 0000000000..b80f1f3df1--- /dev/null+++ b/space/components/issues/issue-layouts/properties/state.tsx@@ -0,0 +1,11 @@+// ui+import { StateGroupIcon } from "@plane/ui";++export const IssueBlockState = ({ state }: any) => (+ <div className="flex w-full items-center justify-between gap-1 rounded border-[0.5px] border-custom-border-300 px-2.5 py-1 text-xs shadow-sm duration-300 focus:outline-none">+ <div className="flex w-full items-center gap-1.5">+ <StateGroupIcon stateGroup={state.group} color={state.color} />+ <div className="text-xs">{state?.name}</div>+ </div>+ </div>+);diff --git a/space/components/views/project-details.tsx b/space/components/issues/issue-layouts/root.tsxsimilarity index 52%rename from space/components/views/project-details.tsxrename to space/components/issues/issue-layouts/root.tsxindex 462c656f0c..e53986c855 100644--- a/space/components/views/project-details.tsx+++ b/space/components/issues/issue-layouts/root.tsx@@ -6,69 +6,55 @@ import Image from "next/image";import { useSearchParams } from "next/navigation";import useSWR from "swr";// components-import { IssueCalendarView } from "@/components/issues/board-views/calendar";-import { IssueGanttView } from "@/components/issues/board-views/gantt";-import { IssueKanbanView } from "@/components/issues/board-views/kanban";-import { IssueListView } from "@/components/issues/board-views/list";-import { IssueSpreadsheetView } from "@/components/issues/board-views/spreadsheet";+import { IssueKanbanLayoutRoot, IssuesListLayoutRoot } from "@/components/issues";import { IssueAppliedFilters } from "@/components/issues/filters/applied-filters/root";import { IssuePeekOverview } from "@/components/issues/peek-overview";-// mobx store-import { useIssue, useUser, useIssueDetails, useIssueFilter, useProject } from "@/hooks/store";+// hooks+import { useIssue, useIssueDetails, useIssueFilter } from "@/hooks/store";+// store+import { PublishStore } from "@/store/publish/publish.store";// assetsimport SomethingWentWrongImage from "public/something-went-wrong.svg";-type ProjectDetailsViewProps = {- workspaceSlug: string;- projectId: string;+type Props = {peekId: string | undefined;+ publishSettings: PublishStore;};-export const ProjectDetailsView: FC<ProjectDetailsViewProps> = observer((props) => {- // router- const searchParams = useSearchParams();+export const IssuesLayoutsRoot: FC<Props> = observer((props) => {+ const { peekId, publishSettings } = props;// query params+ const searchParams = useSearchParams();const states = searchParams.get("states") || undefined;const priority = searchParams.get("priority") || undefined;const labels = searchParams.get("labels") || undefined;-- const { workspaceSlug, projectId, peekId } = props;- // hooks- const { fetchProjectSettings } = useProject();- const { issueFilters } = useIssueFilter();+ // store hooks+ const { getIssueFilters } = useIssueFilter();const { loader, issues, error, fetchPublicIssues } = useIssue();const issueDetailStore = useIssueDetails();- const { data: currentUser, fetchCurrentUser } = useUser();+ // derived values+ const { anchor } = publishSettings;+ const issueFilters = anchor ? getIssueFilters(anchor) : undefined;useSWR(- workspaceSlug && projectId ? "WORKSPACE_PROJECT_SETTINGS" : null,- workspaceSlug && projectId ? () => fetchProjectSettings(workspaceSlug, projectId) : null- );- useSWR(- (workspaceSlug && projectId) || states || priority || labels ? "WORKSPACE_PROJECT_PUBLIC_ISSUES" : null,- (workspaceSlug && projectId) || states || priority || labels- ? () => fetchPublicIssues(workspaceSlug, projectId, { states, priority, labels })- : null- );- useSWR(- workspaceSlug && projectId && !currentUser ? "WORKSPACE_PROJECT_CURRENT_USER" : null,- workspaceSlug && projectId && !currentUser ? () => fetchCurrentUser() : null+ anchor ? `PUBLIC_ISSUES_${anchor}` : null,+ anchor ? () => fetchPublicIssues(anchor, { states, priority, labels }) : null);useEffect(() => {- if (peekId && workspaceSlug && projectId) {+ if (peekId) {issueDetailStore.setPeekId(peekId.toString());}- }, [peekId, issueDetailStore, projectId, workspaceSlug]);+ }, [peekId, issueDetailStore]);// derived valuesconst activeLayout = issueFilters?.display_filters?.layout || undefined;+ if (!anchor) return null;+return (<div className="relative h-full w-full overflow-hidden">- {workspaceSlug && projectId && peekId && (- <IssuePeekOverview workspaceSlug={workspaceSlug} projectId={projectId} peekId={peekId} />- )}+ {peekId && <IssuePeekOverview anchor={anchor} peekId={peekId} />}{loader && !issues ? (<div className="py-10 text-center text-sm text-custom-text-100">Loading...</div>@@ -90,21 +76,18 @@ export const ProjectDetailsView: FC<ProjectDetailsViewProps> = observer((props)activeLayout && (<div className="relative flex h-full w-full flex-col overflow-hidden">{/* applied filters */}- <IssueAppliedFilters workspaceSlug={workspaceSlug} projectId={projectId} />+ <IssueAppliedFilters anchor={anchor} />{activeLayout === "list" && (<div className="relative h-full w-full overflow-y-auto">- <IssueListView workspaceSlug={workspaceSlug} projectId={projectId} />+ <IssuesListLayoutRoot anchor={anchor} /></div>)}{activeLayout === "kanban" && (<div className="relative mx-auto h-full w-full p-5">- <IssueKanbanView workspaceSlug={workspaceSlug} projectId={projectId} />+ <IssueKanbanLayoutRoot anchor={anchor} /></div>)}- {activeLayout === "calendar" && <IssueCalendarView />}- {activeLayout === "spreadsheet" && <IssueSpreadsheetView />}- {activeLayout === "gantt" && <IssueGanttView />}</div>))}diff --git a/space/components/issues/navbar/controls.tsx b/space/components/issues/navbar/controls.tsxindex 20c0ca4084..25f2edfb0c 100644--- a/space/components/issues/navbar/controls.tsx+++ b/space/components/issues/navbar/controls.tsx@@ -4,26 +4,25 @@ import { useEffect, FC } from "react";import { observer } from "mobx-react-lite";import { useRouter, useSearchParams } from "next/navigation";// components+import { IssuesLayoutSelection, NavbarTheme, UserAvatar } from "@/components/issues";import { IssueFiltersDropdown } from "@/components/issues/filters";-import { NavbarIssueBoardView } from "@/components/issues/navbar/issue-board-view";-import { NavbarTheme } from "@/components/issues/navbar/theme";-import { UserAvatar } from "@/components/issues/navbar/user-avatar";// helpersimport { queryParamGenerator } from "@/helpers/query-param-generator";// hooks-import { useProject, useIssueFilter, useIssueDetails } from "@/hooks/store";+import { useIssueFilter, useIssueDetails } from "@/hooks/store";import useIsInIframe from "@/hooks/use-is-in-iframe";+// store+import { PublishStore } from "@/store/publish/publish.store";// typesimport { TIssueLayout } from "@/types/issue";export type NavbarControlsProps = {- workspaceSlug: string;- projectId: string;+ publishSettings: PublishStore;};export const NavbarControls: FC<NavbarControlsProps> = observer((props) => {// props- const { workspaceSlug, projectId } = props;+ const { publishSettings } = props;// routerconst router = useRouter();const searchParams = useSearchParams();@@ -34,24 +33,25 @@ export const NavbarControls: FC<NavbarControlsProps> = observer((props) => {const priority = searchParams.get("priority") || undefined;const peekId = searchParams.get("peekId") || undefined;// hooks- const { issueFilters, isIssueFiltersUpdated, initIssueFilters } = useIssueFilter();- const { settings } = useProject();+ const { getIssueFilters, isIssueFiltersUpdated, initIssueFilters } = useIssueFilter();const { setPeekId } = useIssueDetails();// derived values+ const { anchor, view_props, workspace_detail } = publishSettings;+ const issueFilters = anchor ? getIssueFilters(anchor) : undefined;const activeLayout = issueFilters?.display_filters?.layout || undefined;const isInIframe = useIsInIframe();useEffect(() => {- if (workspaceSlug && projectId && settings) {+ if (anchor && workspace_detail) {const viewsAcceptable: string[] = [];let currentBoard: TIssueLayout | null = null;- if (settings?.views?.list) viewsAcceptable.push("list");- if (settings?.views?.kanban) viewsAcceptable.push("kanban");- if (settings?.views?.calendar) viewsAcceptable.push("calendar");- if (settings?.views?.gantt) viewsAcceptable.push("gantt");- if (settings?.views?.spreadsheet) viewsAcceptable.push("spreadsheet");+ if (view_props?.list) viewsAcceptable.push("list");+ if (view_props?.kanban) viewsAcceptable.push("kanban");+ if (view_props?.calendar) viewsAcceptable.push("calendar");+ if (view_props?.gantt) viewsAcceptable.push("gantt");+ if (view_props?.spreadsheet) viewsAcceptable.push("spreadsheet");if (board) {if (viewsAcceptable.includes(board.toString())) currentBoard = board.toString() as TIssueLayout;@@ -74,39 +74,41 @@ export const NavbarControls: FC<NavbarControlsProps> = observer((props) => {},};- if (!isIssueFiltersUpdated(params)) {- initIssueFilters(projectId, params);- router.push(`/${workspaceSlug}/${projectId}?${queryParam}`);+ if (!isIssueFiltersUpdated(anchor, params)) {+ initIssueFilters(anchor, params);+ router.push(`/issues/${anchor}?${queryParam}`);}}}}}, [- workspaceSlug,- projectId,+ anchor,board,labels,state,priority,peekId,- settings,activeLayout,router,initIssueFilters,setPeekId,isIssueFiltersUpdated,+ view_props,+ workspace_detail,]);+ if (!anchor) return null;+return (<>{/* issue views */}<div className="relative flex flex-shrink-0 items-center gap-1 transition-all delay-150 ease-in-out">- <NavbarIssueBoardView workspaceSlug={workspaceSlug} projectId={projectId} />+ <IssuesLayoutSelection anchor={anchor} /></div>{/* issue filters */}<div className="relative flex flex-shrink-0 items-center gap-1 transition-all delay-150 ease-in-out">- <IssueFiltersDropdown workspaceSlug={workspaceSlug} projectId={projectId} />+ <IssueFiltersDropdown anchor={anchor} /></div>{/* theming */}diff --git a/space/components/issues/navbar/index.ts b/space/components/issues/navbar/index.tsnew file mode 100644index 0000000000..e1bb02d91f--- /dev/null+++ b/space/components/issues/navbar/index.ts@@ -0,0 +1,5 @@+export * from "./controls";+export * from "./layout-selection";+export * from "./root";+export * from "./theme";+export * from "./user-avatar";diff --git a/space/components/issues/navbar/issue-board-view.tsx b/space/components/issues/navbar/issue-board-view.tsxdeleted file mode 100644index 7112299612..0000000000--- a/space/components/issues/navbar/issue-board-view.tsx+++ /dev/null@@ -1,72 +0,0 @@-"use client";--import { FC } from "react";-import { observer } from "mobx-react-lite";-import { useRouter, useSearchParams } from "next/navigation";-// constants-import { issueLayoutViews } from "@/constants/issue";-// helpers-import { queryParamGenerator } from "@/helpers/query-param-generator";-// hooks-import { useIssueFilter } from "@/hooks/store";-// mobx-import { TIssueLayout } from "@/types/issue";--type NavbarIssueBoardViewProps = {- workspaceSlug: string;- projectId: string;-};--export const NavbarIssueBoardView: FC<NavbarIssueBoardViewProps> = observer((props) => {- const router = useRouter();- const searchParams = useSearchParams();- // query params- const labels = searchParams.get("labels") || undefined;- const state = searchParams.get("state") || undefined;- const priority = searchParams.get("priority") || undefined;- const peekId = searchParams.get("peekId") || undefined;- // props- const { workspaceSlug, projectId } = props;- // hooks- const { layoutOptions, issueFilters, updateIssueFilters } = useIssueFilter();-- // derived values- const activeLayout = issueFilters?.display_filters?.layout || undefined;-- const handleCurrentBoardView = (boardView: TIssueLayout) => {- updateIssueFilters(projectId, "display_filters", "layout", boardView);- const { queryParam } = queryParamGenerator({ board: boardView, peekId, priority, state, labels });- router.push(`/${workspaceSlug}/${projectId}?${queryParam}`);- };-- return (- <>- {issueLayoutViews &&- Object.keys(issueLayoutViews).map((key: string) => {- const layoutKey = key as TIssueLayout;- if (layoutOptions[layoutKey]) {- return (- <div- key={layoutKey}- className={`flex h-[28px] w-[28px] cursor-pointer items-center justify-center rounded-sm ${- layoutKey === activeLayout- ? `bg-custom-background-80 text-custom-text-200`- : `text-custom-text-300 hover:bg-custom-background-80`- }`}- onClick={() => handleCurrentBoardView(layoutKey)}- title={layoutKey}- >- <span- className={`material-symbols-rounded text-[18px] ${- issueLayoutViews[layoutKey]?.className ? issueLayoutViews[layoutKey]?.className : ``- }`}- >- {issueLayoutViews[layoutKey]?.icon}- </span>- </div>- );- }- })}- </>- );-});diff --git a/space/components/issues/navbar/layout-selection.tsx b/space/components/issues/navbar/layout-selection.tsxnew file mode 100644index 0000000000..1989710b53--- /dev/null+++ b/space/components/issues/navbar/layout-selection.tsx@@ -0,0 +1,67 @@+"use client";++import { FC } from "react";+import { observer } from "mobx-react-lite";+import { useRouter, useSearchParams } from "next/navigation";+// ui+import { Tooltip } from "@plane/ui";+// constants+import { ISSUE_LAYOUTS } from "@/constants/issue";+// helpers+import { queryParamGenerator } from "@/helpers/query-param-generator";+// hooks+import { useIssueFilter } from "@/hooks/store";+// mobx+import { TIssueLayout } from "@/types/issue";++type Props = {+ anchor: string;+};++export const IssuesLayoutSelection: FC<Props> = observer((props) => {+ const { anchor } = props;+ // router+ const router = useRouter();+ const searchParams = useSearchParams();+ // query params+ const labels = searchParams.get("labels");+ const state = searchParams.get("state");+ const priority = searchParams.get("priority");+ const peekId = searchParams.get("peekId");+ // hooks+ const { layoutOptions, getIssueFilters, updateIssueFilters } = useIssueFilter();+ // derived values+ const issueFilters = getIssueFilters(anchor);+ const activeLayout = issueFilters?.display_filters?.layout || undefined;++ const handleCurrentBoardView = (boardView: TIssueLayout) => {+ updateIssueFilters(anchor, "display_filters", "layout", boardView);+ const { queryParam } = queryParamGenerator({ board: boardView, peekId, priority, state, labels });+ router.push(`/issues/${anchor}?${queryParam}`);+ };++ return (+ <div className="flex items-center gap-1 rounded bg-custom-background-80 p-1">+ {ISSUE_LAYOUTS.map((layout) => {+ if (!layoutOptions[layout.key]) return;++ return (+ <Tooltip key={layout.key} tooltipContent={layout.title}>+ <button+ type="button"+ className={`group grid h-[22px] w-7 place-items-center overflow-hidden rounded transition-all hover:bg-custom-background-100 ${+ activeLayout == layout.key ? "bg-custom-background-100 shadow-custom-shadow-2xs" : ""+ }`}+ onClick={() => handleCurrentBoardView(layout.key)}+ >+ <layout.icon+ strokeWidth={2}+ className={`size-3.5 ${activeLayout == layout.key ? "text-custom-text-100" : "text-custom-text-200"}`}+ />+ </button>+ </Tooltip>+ );+ })}+ </div>+ );+});diff --git a/space/components/issues/navbar/index.tsx b/space/components/issues/navbar/root.tsxsimilarity index 58%rename from space/components/issues/navbar/index.tsxrename to space/components/issues/navbar/root.tsxindex f5d60b8b05..1d1a294d94 100644--- a/space/components/issues/navbar/index.tsx+++ b/space/components/issues/navbar/root.tsx@@ -4,41 +4,40 @@ import { observer } from "mobx-react-lite";import { Briefcase } from "lucide-react";// componentsimport { ProjectLogo } from "@/components/common";-import { NavbarControls } from "@/components/issues/navbar/controls";-// hooks-import { useProject } from "@/hooks/store";+import { NavbarControls } from "@/components/issues";+// store+import { PublishStore } from "@/store/publish/publish.store";-type IssueNavbarProps = {- workspaceSlug: string;- projectId: string;+type Props = {+ publishSettings: PublishStore;};-const IssueNavbar: FC<IssueNavbarProps> = observer((props) => {- const { workspaceSlug, projectId } = props;+export const IssuesNavbarRoot: FC<Props> = observer((props) => {+ const { publishSettings } = props;// hooks- const { project } = useProject();+ const { project_details } = publishSettings;return (<div className="relative flex justify-between w-full gap-4 px-5">{/* project detail */}<div className="flex flex-shrink-0 items-center gap-2">- {project ? (+ {project_details ? (<span className="h-7 w-7 flex-shrink-0 grid place-items-center">- <ProjectLogo logo={project.logo_props} className="text-lg" />+ <ProjectLogo logo={project_details.logo_props} className="text-lg" /></span>) : (<span className="grid h-7 w-7 flex-shrink-0 place-items-center rounded uppercase"><Briefcase className="h-4 w-4" /></span>)}- <div className="line-clamp-1 max-w-[300px] overflow-hidden text-lg font-medium">{project?.name || `...`}</div>+ <div className="line-clamp-1 max-w-[300px] overflow-hidden text-lg font-medium">+ {project_details?.name || `...`}+ </div></div><div className="flex flex-shrink-0 items-center gap-2">- <NavbarControls workspaceSlug={workspaceSlug} projectId={projectId} />+ <NavbarControls publishSettings={publishSettings} /></div></div>);});--export default IssueNavbar;diff --git a/space/components/issues/peek-overview/comment/add-comment.tsx b/space/components/issues/peek-overview/comment/add-comment.tsxindex a1647c9c54..57ed0b6f62 100644--- a/space/components/issues/peek-overview/comment/add-comment.tsx+++ b/space/components/issues/peek-overview/comment/add-comment.tsx@@ -8,7 +8,7 @@ import { TOAST_TYPE, setToast } from "@plane/ui";// editor componentsimport { LiteTextEditor } from "@/components/editor/lite-text-editor";// hooks-import { useIssueDetails, useProject, useUser } from "@/hooks/store";+import { useIssueDetails, usePublish, useUser } from "@/hooks/store";// typesimport { Comment } from "@/types/issue";@@ -17,22 +17,18 @@ const defaultValues: Partial<Comment> = {};type Props = {+ anchor: string;disabled?: boolean;- workspaceSlug: string;- projectId: string;};export const AddComment: React.FC<Props> = observer((props) => {- // const { disabled = false } = props;- const { workspaceSlug, projectId } = props;+ const { anchor } = props;// refsconst editorRef = useRef<EditorRefApi>(null);// store hooks- const { workspace } = useProject();const { peekId: issueId, addIssueComment } = useIssueDetails();const { data: currentUser } = useUser();- // derived values- const workspaceId = workspace?.id;+ const { workspaceSlug, workspace: workspaceID } = usePublish(anchor);// form infoconst {handleSubmit,@@ -43,9 +39,9 @@ export const AddComment: React.FC<Props> = observer((props) => {} = useForm<Comment>({ defaultValues });const onSubmit = async (formData: Comment) => {- if (!workspaceSlug || !projectId || !issueId || isSubmitting || !formData.comment_html) return;+ if (!anchor || !issueId || isSubmitting || !formData.comment_html) return;- await addIssueComment(workspaceSlug, projectId, issueId, formData)+ await addIssueComment(anchor, issueId, formData).then(() => {reset(defaultValues);editorRef.current?.clearEditor();@@ -71,8 +67,8 @@ export const AddComment: React.FC<Props> = observer((props) => {onEnterKeyPress={(e) => {if (currentUser) handleSubmit(onSubmit)(e);}}- workspaceId={workspaceId as string}- workspaceSlug={workspaceSlug}+ workspaceId={workspaceID?.toString() ?? ""}+ workspaceSlug={workspaceSlug?.toString() ?? ""}ref={editorRef}initialValue={!value || value === "" || (typeof value === "object" && Object.keys(value).length === 0)diff --git a/space/components/issues/peek-overview/comment/comment-detail-card.tsx b/space/components/issues/peek-overview/comment/comment-detail-card.tsxindex 3ede0333bd..31e5f73240 100644--- a/space/components/issues/peek-overview/comment/comment-detail-card.tsx+++ b/space/components/issues/peek-overview/comment/comment-detail-card.tsx@@ -10,25 +10,23 @@ import { CommentReactions } from "@/components/issues/peek-overview";// helpersimport { timeAgo } from "@/helpers/date-time.helper";// hooks-import { useIssueDetails, useProject, useUser } from "@/hooks/store";+import { useIssueDetails, usePublish, useUser } from "@/hooks/store";import useIsInIframe from "@/hooks/use-is-in-iframe";// typesimport { Comment } from "@/types/issue";type Props = {- workspaceSlug: string;+ anchor: string;comment: Comment;};export const CommentCard: React.FC<Props> = observer((props) => {- const { comment, workspaceSlug } = props;+ const { anchor, comment } = props;// store hooks- const { workspace } = useProject();const { peekId, deleteIssueComment, updateIssueComment } = useIssueDetails();const { data: currentUser } = useUser();+ const { workspaceSlug, workspace: workspaceID } = usePublish(anchor);const isInIframe = useIsInIframe();- // derived values- const workspaceId = workspace?.id;// statesconst [isEditing, setIsEditing] = useState(false);@@ -45,13 +43,13 @@ export const CommentCard: React.FC<Props> = observer((props) => {});const handleDelete = () => {- if (!workspaceSlug || !peekId) return;- deleteIssueComment(workspaceSlug, comment.project, peekId, comment.id);+ if (!anchor || !peekId) return;+ deleteIssueComment(anchor, peekId, comment.id);};const handleCommentUpdate = async (formData: Comment) => {- if (!workspaceSlug || !peekId) return;- updateIssueComment(workspaceSlug, comment.project, peekId, comment.id, formData);+ if (!anchor || !peekId) return;+ updateIssueComment(anchor, peekId, comment.id, formData);setIsEditing(false);editorRef.current?.setEditorValue(formData.comment_html);showEditorRef.current?.setEditorValue(formData.comment_html);@@ -103,8 +101,8 @@ export const CommentCard: React.FC<Props> = observer((props) => {name="comment_html"render={({ field: { onChange, value } }) => (<LiteTextEditor- workspaceId={workspaceId as string}- workspaceSlug={workspaceSlug}+ workspaceId={workspaceID?.toString() ?? ""}+ workspaceSlug={workspaceSlug?.toString() ?? ""}onEnterKeyPress={handleSubmit(handleCommentUpdate)}ref={editorRef}initialValue={value}@@ -135,7 +133,7 @@ export const CommentCard: React.FC<Props> = observer((props) => {</form><div className={`${isEditing ? "hidden" : ""}`}><LiteTextReadOnlyEditor ref={showEditorRef} initialValue={comment.comment_html} />- <CommentReactions commentId={comment.id} projectId={comment.project} workspaceSlug={workspaceSlug} />+ <CommentReactions anchor={anchor} commentId={comment.id} /></div></div></div>diff --git a/space/components/issues/peek-overview/comment/comment-reactions.tsx b/space/components/issues/peek-overview/comment/comment-reactions.tsxindex ed915eff43..1b39777940 100644--- a/space/components/issues/peek-overview/comment/comment-reactions.tsx+++ b/space/components/issues/peek-overview/comment/comment-reactions.tsx@@ -13,12 +13,12 @@ import { useIssueDetails, useUser } from "@/hooks/store";import useIsInIframe from "@/hooks/use-is-in-iframe";type Props = {+ anchor: string;commentId: string;- projectId: string;- workspaceSlug: string;};export const CommentReactions: React.FC<Props> = observer((props) => {+ const { anchor, commentId } = props;const router = useRouter();const pathName = usePathname();const searchParams = useSearchParams();@@ -28,7 +28,6 @@ export const CommentReactions: React.FC<Props> = observer((props) => {const priority = searchParams.get("priority") || undefined;const labels = searchParams.get("labels") || undefined;- const { commentId, projectId, workspaceSlug } = props;// hooksconst { addCommentReaction, removeCommentReaction, details, peekId } = useIssueDetails();const { data: user } = useUser();@@ -40,13 +39,13 @@ export const CommentReactions: React.FC<Props> = observer((props) => {const userReactions = commentReactions?.filter((r) => r?.actor_detail?.id === user?.id);const handleAddReaction = (reactionHex: string) => {- if (!workspaceSlug || !projectId || !peekId) return;- addCommentReaction(workspaceSlug, projectId, peekId, commentId, reactionHex);+ if (!anchor || !peekId) return;+ addCommentReaction(anchor, peekId, commentId, reactionHex);};const handleRemoveReaction = (reactionHex: string) => {- if (!workspaceSlug || !projectId || !peekId) return;- removeCommentReaction(workspaceSlug, projectId, peekId, commentId, reactionHex);+ if (!anchor || !peekId) return;+ removeCommentReaction(anchor, peekId, commentId, reactionHex);};const handleReactionClick = (reactionHex: string) => {diff --git a/space/components/issues/peek-overview/full-screen-peek-view.tsx b/space/components/issues/peek-overview/full-screen-peek-view.tsxindex f5918de43e..4e9d5ed8cf 100644--- a/space/components/issues/peek-overview/full-screen-peek-view.tsx+++ b/space/components/issues/peek-overview/full-screen-peek-view.tsx@@ -11,14 +11,13 @@ import {import { IIssue } from "@/types/issue";type Props = {+ anchor: string;handleClose: () => void;issueDetails: IIssue | undefined;- workspaceSlug: string;- projectId: string;};export const FullScreenPeekView: React.FC<Props> = observer((props) => {- const { handleClose, issueDetails, workspaceSlug, projectId } = props;+ const { anchor, handleClose, issueDetails } = props;return (<div className="grid h-full w-full grid-cols-10 divide-x divide-custom-border-200 overflow-hidden">@@ -30,17 +29,13 @@ export const FullScreenPeekView: React.FC<Props> = observer((props) => {<div className="h-full w-full overflow-y-auto px-6">{/* issue title and description */}<div className="w-full">- <PeekOverviewIssueDetails issueDetails={issueDetails} />+ <PeekOverviewIssueDetails anchor={anchor} issueDetails={issueDetails} /></div>{/* divider */}<div className="my-5 h-[1] w-full border-t border-custom-border-200" />{/* issue activity/comments */}<div className="w-full pb-5">- <PeekOverviewIssueActivity- issueDetails={issueDetails}- workspaceSlug={workspaceSlug}- projectId={projectId}- />+ <PeekOverviewIssueActivity anchor={anchor} issueDetails={issueDetails} /></div></div>) : (diff --git a/space/components/issues/peek-overview/header.tsx b/space/components/issues/peek-overview/header.tsxindex 0e9b93ab9f..3ad07e06b3 100644--- a/space/components/issues/peek-overview/header.tsx+++ b/space/components/issues/peek-overview/header.tsx@@ -1,10 +1,9 @@import React from "react";import { observer } from "mobx-react-lite";-import { MoveRight } from "lucide-react";+import { Link2, MoveRight } from "lucide-react";import { Listbox, Transition } from "@headlessui/react";// ui-import { setToast, TOAST_TYPE } from "@plane/ui";-import { Icon } from "@/components/ui";+import { CenterPanelIcon, FullScreenPanelIcon, setToast, SidePanelIcon, TOAST_TYPE } from "@plane/ui";// helpersimport { copyTextToClipboard } from "@/helpers/string.helper";// hooks@@ -18,21 +17,21 @@ type Props = {issueDetails: IIssue | undefined;};-const peekModes: {+const PEEK_MODES: {key: IPeekMode;- icon: string;+ icon: any;label: string;}[] = [- { key: "side", icon: "side_navigation", label: "Side Peek" },+ { key: "side", icon: SidePanelIcon, label: "Side Peek" },{key: "modal",- icon: "dialogs",- label: "Modal Peek",+ icon: CenterPanelIcon,+ label: "Modal",},{key: "full",- icon: "nearby",- label: "Full Screen Peek",+ icon: FullScreenPanelIcon,+ label: "Full Screen",},];@@ -47,20 +46,22 @@ export const PeekOverviewHeader: React.FC<Props> = observer((props) => {copyTextToClipboard(urlToCopy).then(() => {setToast({- type: TOAST_TYPE.INFO,+ type: TOAST_TYPE.SUCCESS,title: "Link copied!",- message: "Issue link copied to clipboard",+ message: "Issue link copied to clipboard.",});});};+ const Icon = PEEK_MODES.find((m) => m.key === peekMode)?.icon ?? SidePanelIcon;+return (<><div className="flex items-center justify-between"><div className="flex items-center gap-4">{peekMode === "side" && (- <button type="button" onClick={handleClose}>- <MoveRight className="h-4 w-4" strokeWidth={2} />+ <button type="button" onClick={handleClose} className="text-custom-text-300 hover:text-custom-text-200">+ <MoveRight className="size-4" /></button>)}<Listbox@@ -69,8 +70,10 @@ export const PeekOverviewHeader: React.FC<Props> = observer((props) => {onChange={(val) => setPeekMode(val)}className="relative flex-shrink-0 text-left">- <Listbox.Button className={`grid place-items-center ${peekMode === "full" ? "rotate-45" : ""}`}>- <Icon iconName={peekModes.find((m) => m.key === peekMode)?.icon ?? ""} className="text-[1rem]" />+ <Listbox.Button+ className={`grid place-items-center text-custom-text-300 hover:text-custom-text-200 ${peekMode === "full" ? "rotate-45" : ""}`}+ >+ <Icon className="h-4 w-4 text-custom-text-300 hover:text-custom-text-200" /></Listbox.Button><Transition@@ -84,7 +87,7 @@ export const PeekOverviewHeader: React.FC<Props> = observer((props) => {><Listbox.Options className="absolute left-0 z-10 mt-1 min-w-[8rem] origin-top-left overflow-y-auto whitespace-nowrap rounded-md border border-custom-border-300 bg-custom-background-90 text-xs shadow-lg focus:outline-none"><div className="space-y-1 p-2">- {peekModes.map((mode) => (+ {PEEK_MODES.map((mode) => (<Listbox.Optionkey={mode.key}value={mode.key}@@ -117,8 +120,13 @@ export const PeekOverviewHeader: React.FC<Props> = observer((props) => {</div>{isClipboardWriteAllowed && (peekMode === "side" || peekMode === "modal") && (<div className="flex flex-shrink-0 items-center gap-2">- <button type="button" onClick={handleCopyLink} className="-rotate-45 focus:outline-none" tabIndex={1}>- <Icon iconName="link" className="text-[1rem]" />+ <button+ type="button"+ onClick={handleCopyLink}+ className="focus:outline-none text-custom-text-300 hover:text-custom-text-200"+ tabIndex={1}+ >+ <Link2 className="h-4 w-4 -rotate-45" /></button></div>)}diff --git a/space/components/issues/peek-overview/issue-activity.tsx b/space/components/issues/peek-overview/issue-activity.tsxindex ec73bda7bd..1ccb7fa880 100644--- a/space/components/issues/peek-overview/issue-activity.tsx+++ b/space/components/issues/peek-overview/issue-activity.tsx@@ -7,61 +7,58 @@ import { Button } from "@plane/ui";import { CommentCard, AddComment } from "@/components/issues/peek-overview";import { Icon } from "@/components/ui";// hooks-import { useIssueDetails, useProject, useUser } from "@/hooks/store";+import { useIssueDetails, usePublish, useUser } from "@/hooks/store";import useIsInIframe from "@/hooks/use-is-in-iframe";// typesimport { IIssue } from "@/types/issue";type Props = {+ anchor: string;issueDetails: IIssue;- workspaceSlug: string;- projectId: string;};export const PeekOverviewIssueActivity: React.FC<Props> = observer((props) => {- const { workspaceSlug, projectId } = props;+ const { anchor } = props;// routerconst pathname = usePathname();- // store- const { canComment } = useProject();+ // store hooksconst { details, peekId } = useIssueDetails();const { data: currentUser } = useUser();- const isInIframe = useIsInIframe();-+ const { canComment } = usePublish(anchor);+ // derived valuesconst comments = details[peekId || ""]?.comments || [];+ const isInIframe = useIsInIframe();return (<div className="pb-10"><h4 className="font-medium">Comments</h4>- {workspaceSlug && (- <div className="mt-4">- <div className="space-y-4">- {comments.map((comment: any) => (- <CommentCard key={comment.id} comment={comment} workspaceSlug={workspaceSlug?.toString()} />- ))}- </div>- {!isInIframe &&- (currentUser ? (- <>- {canComment && (- <div className="mt-4">- <AddComment disabled={!currentUser} workspaceSlug={workspaceSlug} projectId={projectId} />- </div>- )}- </>- ) : (- <div className="mt-4 flex items-center justify-between gap-2 rounded border border-custom-border-300 bg-custom-background-80 px-2 py-2.5">- <p className="flex gap-2 overflow-hidden break-words text-sm text-custom-text-200">- <Icon iconName="lock" className="!text-sm" />- Sign in to add your comment- </p>- <Link href={`/?next_path=${pathname}`}>- <Button variant="primary">Sign in</Button>- </Link>- </div>- ))}+ <div className="mt-4">+ <div className="space-y-4">+ {comments.map((comment) => (+ <CommentCard key={comment.id} anchor={anchor} comment={comment} />+ ))}</div>- )}+ {!isInIframe &&+ (currentUser ? (+ <>+ {canComment && (+ <div className="mt-4">+ <AddComment anchor={anchor} disabled={!currentUser} />+ </div>+ )}+ </>+ ) : (+ <div className="mt-4 flex items-center justify-between gap-2 rounded border border-custom-border-300 bg-custom-background-80 px-2 py-2.5">+ <p className="flex gap-2 overflow-hidden break-words text-sm text-custom-text-200">+ <Icon iconName="lock" className="!text-sm" />+ Sign in to add your comment+ </p>+ <Link href={`/?next_path=${pathname}`}>+ <Button variant="primary">Sign in</Button>+ </Link>+ </div>+ ))}+ </div></div>);});diff --git a/space/components/issues/peek-overview/issue-details.tsx b/space/components/issues/peek-overview/issue-details.tsxindex 5fe73f67a4..97a659554b 100644--- a/space/components/issues/peek-overview/issue-details.tsx+++ b/space/components/issues/peek-overview/issue-details.tsx@@ -5,26 +5,33 @@ import { IssueReactions } from "@/components/issues/peek-overview";import { IIssue } from "@/types/issue";type Props = {+ anchor: string;issueDetails: IIssue;};-export const PeekOverviewIssueDetails: React.FC<Props> = ({ issueDetails }) => (- <div className="space-y-2">- <h6 className="font-medium text-custom-text-200">- {issueDetails.project_detail.identifier}-{issueDetails.sequence_id}- </h6>- <h4 className="break-words text-2xl font-semibold">{issueDetails.name}</h4>- {issueDetails.description_html !== "" && issueDetails.description_html !== "<p></p>" && (- <RichTextReadOnlyEditor- initialValue={- !issueDetails.description_html ||- issueDetails.description_html === "" ||- (typeof issueDetails.description_html === "object" && Object.keys(issueDetails.description_html).length === 0)- ? "<p></p>"- : issueDetails.description_html- }- />- )}- <IssueReactions />- </div>-);+export const PeekOverviewIssueDetails: React.FC<Props> = (props) => {+ const { anchor, issueDetails } = props;++ const description = issueDetails.description_html;++ return (+ <div className="space-y-2">+ <h6 className="text-base font-medium text-custom-text-400">+ {issueDetails.project_detail?.identifier}-{issueDetails?.sequence_id}+ </h6>+ <h4 className="break-words text-2xl font-medium">{issueDetails.name}</h4>+ {description !== "" && description !== "<p></p>" && (+ <RichTextReadOnlyEditor+ initialValue={+ !description ||+ description === "" ||+ (typeof description === "object" && Object.keys(description).length === 0)+ ? "<p></p>"+ : description+ }+ />+ )}+ <IssueReactions anchor={anchor} />+ </div>+ );+};diff --git a/space/components/issues/peek-overview/issue-emoji-reactions.tsx b/space/components/issues/peek-overview/issue-emoji-reactions.tsxindex 4a0e615542..ae960eab33 100644--- a/space/components/issues/peek-overview/issue-emoji-reactions.tsx+++ b/space/components/issues/peek-overview/issue-emoji-reactions.tsx@@ -1,4 +1,3 @@-import { useEffect } from "react";import { observer } from "mobx-react-lite";import { usePathname, useRouter, useSearchParams } from "next/navigation";// lib@@ -11,11 +10,12 @@ import { queryParamGenerator } from "@/helpers/query-param-generator";import { useIssueDetails, useUser } from "@/hooks/store";type IssueEmojiReactionsProps = {- workspaceSlug: string;- projectId: string;+ anchor: string;};export const IssueEmojiReactions: React.FC<IssueEmojiReactionsProps> = observer((props) => {+ const { anchor } = props;+ // routerconst router = useRouter();const pathName = usePathname();const searchParams = useSearchParams();@@ -25,11 +25,9 @@ export const IssueEmojiReactions: React.FC<IssueEmojiReactionsProps> = observer(const state = searchParams.get("state") || undefined;const priority = searchParams.get("priority") || undefined;const labels = searchParams.get("labels") || undefined;-- const { workspaceSlug, projectId } = props;- // store+ // store hooksconst issueDetailsStore = useIssueDetails();- const { data: user, fetchCurrentUser } = useUser();+ const { data: user } = useUser();const issueId = issueDetailsStore.peekId;const reactions = issueId ? issueDetailsStore.details[issueId]?.reactions || [] : [];@@ -38,13 +36,13 @@ export const IssueEmojiReactions: React.FC<IssueEmojiReactionsProps> = observer(const userReactions = reactions?.filter((r) => r.actor_detail.id === user?.id);const handleAddReaction = (reactionHex: string) => {- if (!workspaceSlug || !projectId || !issueId) return;- issueDetailsStore.addIssueReaction(workspaceSlug.toString(), projectId.toString(), issueId, reactionHex);+ if (!issueId) return;+ issueDetailsStore.addIssueReaction(anchor, issueId, reactionHex);};const handleRemoveReaction = (reactionHex: string) => {- if (!workspaceSlug || !projectId || !issueId) return;- issueDetailsStore.removeIssueReaction(workspaceSlug.toString(), projectId.toString(), issueId, reactionHex);+ if (!issueId) return;+ issueDetailsStore.removeIssueReaction(anchor, issueId, reactionHex);};const handleReactionClick = (reactionHex: string) => {@@ -53,11 +51,6 @@ export const IssueEmojiReactions: React.FC<IssueEmojiReactionsProps> = observer(else handleAddReaction(reactionHex);};- useEffect(() => {- if (user) return;- fetchCurrentUser();- }, [user, fetchCurrentUser]);-// derived valuesconst { queryParam } = queryParamGenerator({ peekId, board, state, priority, labels });diff --git a/space/components/issues/peek-overview/issue-properties.tsx b/space/components/issues/peek-overview/issue-properties.tsxindex 08d22b3124..2bdfe21bb3 100644--- a/space/components/issues/peek-overview/issue-properties.tsx+++ b/space/components/issues/peek-overview/issue-properties.tsx@@ -1,16 +1,17 @@+import { CalendarCheck2, Signal } from "lucide-react";// ui-import { StateGroupIcon, TOAST_TYPE, setToast } from "@plane/ui";-// icons+import { DoubleCircleIcon, StateGroupIcon, TOAST_TYPE, setToast } from "@plane/ui";+// componentsimport { Icon } from "@/components/ui";// constants-import { issueGroupFilter, issuePriorityFilter } from "@/constants/issue";+import { issuePriorityFilter } from "@/constants/issue";// helpers-import { renderFullDate } from "@/helpers/date-time.helper";+import { cn } from "@/helpers/common.helper";+import { renderFormattedDate } from "@/helpers/date-time.helper";+import { shouldHighlightIssueDueDate } from "@/helpers/issue.helper";import { copyTextToClipboard, addSpaceIfCamelCase } from "@/helpers/string.helper";// typesimport { IIssue, IPeekMode } from "@/types/issue";-// components-import { dueDateIconDetails } from "../board-views/block-due-date";type Props = {issueDetails: IIssue;@@ -19,12 +20,9 @@ type Props = {export const PeekOverviewIssueProperties: React.FC<Props> = ({ issueDetails, mode }) => {const state = issueDetails.state_detail;- const stateGroup = issueGroupFilter(state.group);const priority = issueDetails.priority ? issuePriorityFilter(issueDetails.priority) : null;- const dueDateIcon = dueDateIconDetails(issueDetails.target_date, state.group);-const handleCopyLink = () => {const urlToCopy = window.location.href;@@ -51,28 +49,22 @@ export const PeekOverviewIssueProperties: React.FC<Props> = ({ issueDetails, mod</div></div>)}- <div className={`space-y-4 ${mode === "full" ? "pt-3" : ""}`}>- <div className="flex items-center gap-2 text-sm">- <div className="flex w-1/4 flex-shrink-0 items-center gap-2 font-medium">- <Icon iconName="radio_button_checked" className="flex-shrink-0 !text-base" />- <span className="flex-grow truncate">State</span>+ <div className={`space-y-2 ${mode === "full" ? "pt-3" : ""}`}>+ <div className="flex items-center gap-3 h-8">+ <div className="flex items-center gap-1 w-1/4 flex-shrink-0 text-sm text-custom-text-300">+ <DoubleCircleIcon className="size-4 flex-shrink-0" />+ <span>State</span></div>- <div className="w-3/4">- {stateGroup && (- <div className="inline-flex rounded bg-custom-background-80 px-2.5 py-0.5 text-sm">- <div className="flex items-center gap-1.5 text-left text-custom-text-100">- <StateGroupIcon stateGroup={state.group} color={state.color} />- {addSpaceIfCamelCase(state?.name ?? "")}- </div>- </div>- )}+ <div className="w-3/4 flex items-center gap-1.5 py-0.5 text-sm">+ <StateGroupIcon stateGroup={state.group} color={state.color} />+ {addSpaceIfCamelCase(state?.name ?? "")}</div></div>- <div className="flex items-center gap-2 text-sm">- <div className="flex w-1/4 flex-shrink-0 items-center gap-2 font-medium">- <Icon iconName="signal_cellular_alt" className="flex-shrink-0 !text-base" />- <span className="flex-grow truncate">Priority</span>+ <div className="flex items-center gap-3 h-8">+ <div className="flex items-center gap-1 w-1/4 flex-shrink-0 text-sm text-custom-text-300">+ <Signal className="size-4 flex-shrink-0" />+ <span>Priority</span></div><div className="w-3/4"><div@@ -97,18 +89,24 @@ export const PeekOverviewIssueProperties: React.FC<Props> = ({ issueDetails, mod</div></div></div>- <div className="flex items-center gap-2 text-sm">- <div className="flex w-1/4 flex-shrink-0 items-center gap-2 font-medium">- <Icon iconName="calendar_today" className="flex-shrink-0 !text-base" />- <span className="flex-grow truncate">Due date</span>++ <div className="flex items-center gap-3 h-8">+ <div className="flex items-center gap-1 w-1/4 flex-shrink-0 text-sm text-custom-text-300">+ <CalendarCheck2 className="size-4 flex-shrink-0" />+ <span>Due date</span></div><div>{issueDetails.target_date ? (- <div className="flex h-6 items-center gap-1 rounded border border-custom-border-100 bg-custom-background-80 px-2.5 py-1 text-xs text-custom-text-100">- <span className={`material-symbols-rounded -my-0.5 text-sm ${dueDateIcon.className}`}>- {dueDateIcon.iconName}- </span>- {renderFullDate(issueDetails.target_date)}+ <div+ className={cn("flex items-center gap-1.5 rounded py-0.5 text-xs text-custom-text-100", {+ "text-red-500": shouldHighlightIssueDueDate(+ issueDetails.target_date,+ issueDetails.state_detail.group+ ),+ })}+ >+ <CalendarCheck2 className="size-3" />+ {renderFormattedDate(issueDetails.target_date)}</div>) : (<span className="text-custom-text-200">Empty</span>diff --git a/space/components/issues/peek-overview/issue-reaction.tsx b/space/components/issues/peek-overview/issue-reaction.tsxindex 87210f3776..c3b580abc0 100644--- a/space/components/issues/peek-overview/issue-reaction.tsx+++ b/space/components/issues/peek-overview/issue-reaction.tsx@@ -1,33 +1,31 @@-import { useParams } from "next/navigation";+import { observer } from "mobx-react-lite";import { IssueEmojiReactions, IssueVotes } from "@/components/issues/peek-overview";-import { useProject } from "@/hooks/store";+// hooks+import { usePublish } from "@/hooks/store";import useIsInIframe from "@/hooks/use-is-in-iframe";-// type IssueReactionsProps = {-// workspaceSlug: string;-// projectId: string;-// };--export const IssueReactions: React.FC = () => {- const { workspace_slug: workspaceSlug, project_id: projectId } = useParams<any>();+type Props = {+ anchor: string;+};- const { canVote, canReact } = useProject();+export const IssueReactions: React.FC<Props> = observer((props) => {+ const { anchor } = props;+ // store hooks+ const { canVote, canReact } = usePublish(anchor);const isInIframe = useIsInIframe();return (<div className="mt-4 flex items-center gap-3">{canVote && (- <>- <div className="flex items-center gap-2">- <IssueVotes workspaceSlug={workspaceSlug} projectId={projectId} />- </div>- </>+ <div className="flex items-center gap-2">+ <IssueVotes anchor={anchor} />+ </div>)}{!isInIframe && canReact && (<div className="flex items-center gap-2">- <IssueEmojiReactions workspaceSlug={workspaceSlug} projectId={projectId} />+ <IssueEmojiReactions anchor={anchor} /></div>)}</div>);-};+});diff --git a/space/components/issues/peek-overview/issue-vote-reactions.tsx b/space/components/issues/peek-overview/issue-vote-reactions.tsxindex 1e565e8626..6b24e5a9f5 100644--- a/space/components/issues/peek-overview/issue-vote-reactions.tsx+++ b/space/components/issues/peek-overview/issue-vote-reactions.tsx@@ -1,6 +1,6 @@"use client";-import { useState, useEffect } from "react";+import { useState } from "react";import { observer } from "mobx-react-lite";import { usePathname, useRouter, useSearchParams } from "next/navigation";import { Tooltip } from "@plane/ui";@@ -12,11 +12,14 @@ import { useIssueDetails, useUser } from "@/hooks/store";import useIsInIframe from "@/hooks/use-is-in-iframe";type TIssueVotes = {- workspaceSlug: string;- projectId: string;+ anchor: string;};export const IssueVotes: React.FC<TIssueVotes> = observer((props) => {+ const { anchor } = props;+ // states+ const [isSubmitting, setIsSubmitting] = useState(false);+ // routerconst router = useRouter();const pathName = usePathname();const searchParams = useSearchParams();@@ -26,13 +29,9 @@ export const IssueVotes: React.FC<TIssueVotes> = observer((props) => {const state = searchParams.get("state") || undefined;const priority = searchParams.get("priority") || undefined;const labels = searchParams.get("labels") || undefined;-- const { workspaceSlug, projectId } = props;- // states- const [isSubmitting, setIsSubmitting] = useState(false);-+ // store hooksconst issueDetailsStore = useIssueDetails();- const { data: user, fetchCurrentUser } = useUser();+ const { data: user } = useUser();const isInIframe = useIsInIframe();@@ -47,28 +46,22 @@ export const IssueVotes: React.FC<TIssueVotes> = observer((props) => {const isDownVotedByUser = allDownVotes?.some((vote) => vote.actor === user?.id);const handleVote = async (e: any, voteValue: 1 | -1) => {- if (!workspaceSlug || !projectId || !issueId) return;+ if (!issueId) return;setIsSubmitting(true);const actionPerformed = votes?.find((vote) => vote.actor === user?.id && vote.vote === voteValue);- if (actionPerformed)- await issueDetailsStore.removeIssueVote(workspaceSlug.toString(), projectId.toString(), issueId);- else- await issueDetailsStore.addIssueVote(workspaceSlug.toString(), projectId.toString(), issueId, {+ if (actionPerformed) await issueDetailsStore.removeIssueVote(anchor, issueId);+ else {+ await issueDetailsStore.addIssueVote(anchor, issueId, {vote: voteValue,});+ }setIsSubmitting(false);};- useEffect(() => {- if (user) return;-- fetchCurrentUser();- }, [user, fetchCurrentUser]);-const VOTES_LIMIT = 1000;// derived valuesdiff --git a/space/components/issues/peek-overview/layout.tsx b/space/components/issues/peek-overview/layout.tsxindex 453cc59f3c..d1fe6f7aa0 100644--- a/space/components/issues/peek-overview/layout.tsx+++ b/space/components/issues/peek-overview/layout.tsx@@ -10,13 +10,12 @@ import { FullScreenPeekView, SidePeekView } from "@/components/issues/peek-overvimport { useIssue, useIssueDetails } from "@/hooks/store";type TIssuePeekOverview = {- workspaceSlug: string;- projectId: string;+ anchor: string;peekId: string;};export const IssuePeekOverview: FC<TIssuePeekOverview> = observer((props) => {- const { workspaceSlug, projectId, peekId } = props;+ const { anchor, peekId } = props;const router = useRouter();const searchParams = useSearchParams();// query params@@ -34,21 +33,23 @@ export const IssuePeekOverview: FC<TIssuePeekOverview> = observer((props) => {const issueDetails = issueDetailStore.peekId && peekId ? issueDetailStore.details[peekId.toString()] : undefined;useEffect(() => {- if (workspaceSlug && projectId && peekId && issueStore.issues && issueStore.issues.length > 0) {+ if (anchor && peekId && issueStore.issues && issueStore.issues.length > 0) {if (!issueDetails) {- issueDetailStore.fetchIssueDetails(workspaceSlug.toString(), projectId.toString(), peekId.toString());+ issueDetailStore.fetchIssueDetails(anchor, peekId.toString());}}- }, [workspaceSlug, projectId, issueDetailStore, issueDetails, peekId, issueStore.issues]);+ }, [anchor, issueDetailStore, issueDetails, peekId, issueStore.issues]);const handleClose = () => {issueDetailStore.setPeekId(null);- let queryParams: any = { board: board };+ let queryParams: any = {+ board,+ };if (priority && priority.length > 0) queryParams = { ...queryParams, priority: priority };if (state && state.length > 0) queryParams = { ...queryParams, state: state };if (labels && labels.length > 0) queryParams = { ...queryParams, labels: labels };queryParams = new URLSearchParams(queryParams).toString();- router.push(`/${workspaceSlug}/${projectId}?${queryParams}`);+ router.push(`/issues/${anchor}?${queryParams}`);};useEffect(() => {@@ -80,12 +81,7 @@ export const IssuePeekOverview: FC<TIssuePeekOverview> = observer((props) => {leaveTo="translate-x-full"><Dialog.Panel className="fixed right-0 top-0 z-20 h-full w-1/2 bg-custom-background-100 shadow-custom-shadow-sm">- <SidePeekView- handleClose={handleClose}- issueDetails={issueDetails}- workspaceSlug={workspaceSlug}- projectId={projectId}- />+ <SidePeekView anchor={anchor} handleClose={handleClose} issueDetails={issueDetails} /></Dialog.Panel></Transition.Child></Dialog>@@ -119,20 +115,10 @@ export const IssuePeekOverview: FC<TIssuePeekOverview> = observer((props) => {}`}>{issueDetailStore.peekMode === "modal" && (- <SidePeekView- handleClose={handleClose}- issueDetails={issueDetails}- workspaceSlug={workspaceSlug}- projectId={projectId}- />+ <SidePeekView anchor={anchor} handleClose={handleClose} issueDetails={issueDetails} />)}{issueDetailStore.peekMode === "full" && (- <FullScreenPeekView- handleClose={handleClose}- issueDetails={issueDetails}- workspaceSlug={workspaceSlug}- projectId={projectId}- />+ <FullScreenPeekView anchor={anchor} handleClose={handleClose} issueDetails={issueDetails} />)}</div></Dialog.Panel>diff --git a/space/components/issues/peek-overview/side-peek-view.tsx b/space/components/issues/peek-overview/side-peek-view.tsxindex a0b544bddb..8944414181 100644--- a/space/components/issues/peek-overview/side-peek-view.tsx+++ b/space/components/issues/peek-overview/side-peek-view.tsx@@ -7,22 +7,21 @@ import {PeekOverviewIssueDetails,PeekOverviewIssueProperties,} from "@/components/issues/peek-overview";-// hooks-import { useProject } from "@/hooks/store";+// store hooks+import { usePublish } from "@/hooks/store";// typesimport { IIssue } from "@/types/issue";type Props = {+ anchor: string;handleClose: () => void;issueDetails: IIssue | undefined;- workspaceSlug: string;- projectId: string;};export const SidePeekView: React.FC<Props> = observer((props) => {- const { handleClose, issueDetails, workspaceSlug, projectId } = props;-- const { settings } = useProject();+ const { anchor, handleClose, issueDetails } = props;+ // store hooks+ const { canComment } = usePublish(anchor);return (<div className="flex h-full w-full flex-col overflow-hidden">@@ -33,7 +32,7 @@ export const SidePeekView: React.FC<Props> = observer((props) => {<div className="h-full w-full overflow-y-auto px-6">{/* issue title and description */}<div className="w-full">- <PeekOverviewIssueDetails issueDetails={issueDetails} />+ <PeekOverviewIssueDetails anchor={anchor} issueDetails={issueDetails} /></div>{/* issue properties */}<div className="mt-6 w-full">@@ -42,13 +41,9 @@ export const SidePeekView: React.FC<Props> = observer((props) => {{/* divider */}<div className="my-5 h-[1] w-full border-t border-custom-border-200" />{/* issue activity/comments */}- {settings?.comments && (+ {canComment && (<div className="w-full pb-5">- <PeekOverviewIssueActivity- issueDetails={issueDetails}- workspaceSlug={workspaceSlug}- projectId={projectId}- />+ <PeekOverviewIssueActivity anchor={anchor} issueDetails={issueDetails} /></div>)}</div>diff --git a/space/components/ui/dropdown.tsx b/space/components/ui/dropdown.tsxdeleted file mode 100644index 788627094b..0000000000--- a/space/components/ui/dropdown.tsx+++ /dev/null@@ -1,142 +0,0 @@-import { Fragment, useState, useRef } from "react";-import Link from "next/link";-import { Check, ChevronLeft } from "lucide-react";-import { Popover, Transition } from "@headlessui/react";-// hooks-import useOutSideClick from "hooks/use-outside-click";--type ItemOptionType = {- display: React.ReactNode;- as?: "button" | "link" | "div";- href?: string;- isSelected?: boolean;- onClick?: () => void;- children?: ItemOptionType[] | null;-};--type DropdownItemProps = {- item: ItemOptionType;-};--type DropDownListProps = {- open: boolean;- handleClose?: () => void;- items: ItemOptionType[];-};--type DropdownProps = {- button: React.ReactNode | (() => React.ReactNode);- items: ItemOptionType[];-};--const DropdownList: React.FC<DropDownListProps> = (props) => {- const { open, items, handleClose } = props;-- const ref = useRef(null);-- useOutSideClick(ref, () => {- if (handleClose) handleClose();- });-- return (- <Popover className="absolute -left-1">- <Transition- show={open}- as={Fragment}- enter="transition ease-out duration-200"- enterFrom="opacity-0 translate-y-1"- enterTo="opacity-100 translate-y-0"- leave="transition ease-in duration-150"- leaveFrom="opacity-100 translate-y-0"- leaveTo="opacity-0 translate-y-1"- >- <Popover.Panel- ref={ref}- className="absolute left-1/2 z-10 mt-1 max-w-[9rem] origin-top-right -translate-x-full select-none rounded-md border border-custom-border-300 bg-custom-background-90 text-xs shadow-lg focus:outline-none"- >- <div className="w-full rounded-md text-sm shadow-lg">- {items.map((item, index) => (- <DropdownItem key={index} item={item} />- ))}- </div>- </Popover.Panel>- </Transition>- </Popover>- );-};--const DropdownItem: React.FC<DropdownItemProps> = (props) => {- const { item } = props;- const { display, children, as: itemAs, href, onClick, isSelected } = item;-- const [open, setOpen] = useState(false);-- return (- <div className="group relative flex w-full gap-x-6 rounded-lg p-1">- {(!itemAs || itemAs === "button" || itemAs === "div") && (- <button- type="button"- onClick={() => {- if (!children) {- if (onClick) onClick();- return;- }- setOpen((prev) => !prev);- }}- className={`flex w-full items-center gap-1 rounded px-1 py-1.5 text-custom-text-200 hover:bg-custom-background-80 ${- isSelected ? "bg-custom-background-80" : ""- }`}- >- {children && <ChevronLeft className="h-4 w-4 transform transition-transform" strokeWidth={2} />}- {!children && <span />}- <span className="truncate text-xs">{display}</span>- <Check className={`h-3 w-3 opacity-0 ${isSelected ? "opacity-100" : ""}`} strokeWidth={2} />- </button>- )}-- {itemAs === "link" && <Link href={href || "#"}>{display}</Link>}-- {children && <DropdownList open={open} handleClose={() => setOpen(false)} items={children} />}- </div>- );-};--const Dropdown: React.FC<DropdownProps> = (props) => {- const { button, items } = props;-- return (- <Popover className="relative">- {({ open }) => (- <>- <Popover.Button- className={`group flex items-center justify-between gap-2 rounded-md border border-custom-border-200 px-3 py-1.5 text-xs shadow-sm duration-300 hover:bg-custom-background-90 hover:text-custom-text-100 focus:outline-none ${- open ? "bg-custom-background-90 text-custom-text-100" : "text-custom-text-200"- }`}- >- {typeof button === "function" ? button() : button}- </Popover.Button>-- <Transition- as={Fragment}- enter="transition ease-out duration-200"- enterFrom="opacity-0 translate-y-1"- enterTo="opacity-100 translate-y-0"- leave="transition ease-in duration-150"- leaveFrom="opacity-100 translate-y-0"- leaveTo="opacity-0 translate-y-1"- >- <Popover.Panel className="absolute left-full z-10 mt-1 w-36 origin-top-right -translate-x-full select-none rounded-md border border-custom-border-300 bg-custom-background-90 text-xs shadow-lg focus:outline-none">- <div className="w-full">- {items.map((item, index) => (- <DropdownItem key={index} item={item} />- ))}- </div>- </Popover.Panel>- </Transition>- </>- )}- </Popover>- );-};--export { Dropdown };diff --git a/space/components/ui/index.ts b/space/components/ui/index.tsindex 1e523d5ddf..ccd2303c4a 100644--- a/space/components/ui/index.ts+++ b/space/components/ui/index.ts@@ -1,3 +1,2 @@-export * from "./dropdown";export * from "./icon";export * from "./reaction-selector";diff --git a/space/components/views/index.ts b/space/components/views/index.tsindex 251de14e30..97ccf76494 100644--- a/space/components/views/index.ts+++ b/space/components/views/index.ts@@ -1,2 +1 @@export * from "./auth";-export * from "./project-details";diff --git a/space/constants/issue.ts b/space/constants/issue.tsindex fb9c78fcd7..77297946f9 100644--- a/space/constants/issue.ts+++ b/space/constants/issue.ts@@ -1,13 +1,7 @@-// interfaces-import {- TIssueLayout,- TIssueLayoutViews,- TIssueFilterKeys,- TIssueFilterPriority,- TIssueFilterPriorityObject,- TIssueFilterState,- TIssueFilterStateObject,-} from "types/issue";+import { Calendar, GanttChartSquare, Kanban, List, Sheet } from "lucide-react";+// types+import { TIssuePriorities } from "@plane/types";+import { TIssueLayout, TIssueFilterKeys, TIssueFilterPriorityObject } from "@/types/issue";// issue filtersexport const ISSUE_DISPLAY_FILTERS_BY_LAYOUT: { [key in TIssueLayout]: Record<"filters", TIssueFilterKeys[]> } = {@@ -28,20 +22,18 @@ export const ISSUE_DISPLAY_FILTERS_BY_LAYOUT: { [key in TIssueLayout]: Record<"f},};-export const issueLayoutViews: Partial<TIssueLayoutViews> = {- list: {- title: "List View",- icon: "format_list_bulleted",- className: "",- },- kanban: {- title: "Board View",- icon: "grid_view",- className: "",- },-};+export const ISSUE_LAYOUTS: {+ key: TIssueLayout;+ title: string;+ icon: any;+}[] = [+ { key: "list", title: "List", icon: List },+ { key: "kanban", title: "Kanban", icon: Kanban },+ { key: "calendar", title: "Calendar", icon: Calendar },+ { key: "spreadsheet", title: "Spreadsheet", icon: Sheet },+ { key: "gantt", title: "Gantt chart", icon: GanttChartSquare },+];-// issue priority filtersexport const issuePriorityFilters: TIssueFilterPriorityObject[] = [{key: "urgent",@@ -75,7 +67,7 @@ export const issuePriorityFilters: TIssueFilterPriorityObject[] = [},];-export const issuePriorityFilter = (priorityKey: TIssueFilterPriority): TIssueFilterPriorityObject | undefined => {+export const issuePriorityFilter = (priorityKey: TIssuePriorities): TIssueFilterPriorityObject | undefined => {const currentIssuePriority: TIssueFilterPriorityObject | undefined =issuePriorityFilters && issuePriorityFilters.length > 0? issuePriorityFilters.find((_priority) => _priority.key === priorityKey)@@ -84,55 +76,3 @@ export const issuePriorityFilter = (priorityKey: TIssueFilterPriority): TIssueFiif (currentIssuePriority) return currentIssuePriority;return undefined;};--// issue group filters-export const issueGroupColors: {- [key in TIssueFilterState]: string;-} = {- backlog: "#d9d9d9",- unstarted: "#3f76ff",- started: "#f59e0b",- completed: "#16a34a",- cancelled: "#dc2626",-};--export const issueGroups: TIssueFilterStateObject[] = [- {- key: "backlog",- title: "Backlog",- color: "#d9d9d9",- className: `text-[#d9d9d9] bg-[#d9d9d9]/10`,- },- {- key: "unstarted",- title: "Unstarted",- color: "#3f76ff",- className: `text-[#3f76ff] bg-[#3f76ff]/10`,- },- {- key: "started",- title: "Started",- color: "#f59e0b",- className: `text-[#f59e0b] bg-[#f59e0b]/10`,- },- {- key: "completed",- title: "Completed",- color: "#16a34a",- className: `text-[#16a34a] bg-[#16a34a]/10`,- },- {- key: "cancelled",- title: "Cancelled",- color: "#dc2626",- className: `text-[#dc2626] bg-[#dc2626]/10`,- },-];--export const issueGroupFilter = (issueKey: TIssueFilterState): TIssueFilterStateObject | undefined => {- const currentIssueStateGroup: TIssueFilterStateObject | undefined =- issueGroups && issueGroups.length > 0 ? issueGroups.find((group) => group.key === issueKey) : undefined;-- if (currentIssueStateGroup) return currentIssueStateGroup;- return undefined;-};diff --git a/space/constants/state.ts b/space/constants/state.tsnew file mode 100644index 0000000000..b0fd622be0--- /dev/null+++ b/space/constants/state.ts@@ -0,0 +1,37 @@+import { TStateGroups } from "@plane/types";++export const STATE_GROUPS: {+ [key in TStateGroups]: {+ key: TStateGroups;+ label: string;+ color: string;+ };+} = {+ backlog: {+ key: "backlog",+ label: "Backlog",+ color: "#d9d9d9",+ },+ unstarted: {+ key: "unstarted",+ label: "Unstarted",+ color: "#3f76ff",+ },+ started: {+ key: "started",+ label: "Started",+ color: "#f59e0b",+ },+ completed: {+ key: "completed",+ label: "Completed",+ color: "#16a34a",+ },+ cancelled: {+ key: "cancelled",+ label: "Canceled",+ color: "#dc2626",+ },+};++export const ARCHIVABLE_STATE_GROUPS = [STATE_GROUPS.completed.key, STATE_GROUPS.cancelled.key];diff --git a/space/constants/workspace.ts b/space/constants/workspace.tsdeleted file mode 100644index 5ae5a7cf4f..0000000000--- a/space/constants/workspace.ts+++ /dev/null@@ -1,12 +0,0 @@-export const USER_ROLES = [- { value: "Product / Project Manager", label: "Product / Project Manager" },- { value: "Development / Engineering", label: "Development / Engineering" },- { value: "Founder / Executive", label: "Founder / Executive" },- { value: "Freelancer / Consultant", label: "Freelancer / Consultant" },- { value: "Marketing / Growth", label: "Marketing / Growth" },- { value: "Sales / Business Development", label: "Sales / Business Development" },- { value: "Support / Operations", label: "Support / Operations" },- { value: "Student / Professor", label: "Student / Professor" },- { value: "Human Resources", label: "Human Resources" },- { value: "Other", label: "Other" },-];diff --git a/space/helpers/date-time.helper.ts b/space/helpers/date-time.helper.tsindex f19a5358bf..3930bcb833 100644--- a/space/helpers/date-time.helper.ts+++ b/space/helpers/date-time.helper.ts@@ -1,3 +1,6 @@+import { format, isValid } from "date-fns";+import isNumber from "lodash/isNumber";+export const timeAgo = (time: any) => {switch (typeof time) {case "number":@@ -14,24 +17,43 @@ export const timeAgo = (time: any) => {};/**- * @description Returns date and month, if date is of the current year- * @description Returns date, month adn year, if date is of a different year than current- * @param {string} date- * @example renderFullDate("2023-01-01") // 1 Jan- * @example renderFullDate("2021-01-01") // 1 Jan, 2021+ * This method returns a date from string of type yyyy-mm-dd+ * This method is recommended to use instead of new Date() as this does not introduce any timezone offsets+ * @param date+ * @returns date or undefined*/+export const getDate = (date: string | Date | undefined | null): Date | undefined => {+ try {+ if (!date || date === "") return;-export const renderFullDate = (date: string): string => {- if (!date) return "";-- const months: string[] = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];+ if (typeof date !== "string" && !(date instanceof String)) return date;- const currentDate: Date = new Date();- const [year, month, day]: number[] = date.split("-").map(Number);+ const [yearString, monthString, dayString] = date.substring(0, 10).split("-");+ const year = parseInt(yearString);+ const month = parseInt(monthString);+ const day = parseInt(dayString);+ if (!isNumber(year) || !isNumber(month) || !isNumber(day)) return;- const formattedMonth: string = months[month - 1];- const formattedDay: string = day < 10 ? `0${day}` : day.toString();+ return new Date(year, month - 1, day);+ } catch (e) {+ return undefined;+ }+};- if (currentDate.getFullYear() === year) return `${formattedDay} ${formattedMonth}`;- else return `${formattedDay} ${formattedMonth}, ${year}`;+/**+ * @returns {string | null} formatted date in the format of MMM dd, yyyy+ * @description Returns date in the formatted format+ * @param {Date | string} date+ * @example renderFormattedDate("2024-01-01") // Jan 01, 2024+ */+export const renderFormattedDate = (date: string | Date | undefined | null): string | null => {+ // Parse the date to check if it is valid+ const parsedDate = getDate(date);+ // return if undefined+ if (!parsedDate) return null;+ // Check if the parsed date is valid before formatting+ if (!isValid(parsedDate)) return null; // Return null for invalid dates+ // Format the date in format (MMM dd, yyyy)+ const formattedDate = format(parsedDate, "MMM dd, yyyy");+ return formattedDate;};diff --git a/space/helpers/emoji.helper.tsx b/space/helpers/emoji.helper.tsxindex 7c9f3cfcb2..d5f9d1b5a5 100644--- a/space/helpers/emoji.helper.tsx+++ b/space/helpers/emoji.helper.tsx@@ -1,23 +1,3 @@-export const getRandomEmoji = () => {- const emojis = [- "8986",- "9200",- "128204",- "127773",- "127891",- "127947",- "128076",- "128077",- "128187",- "128188",- "128512",- "128522",- "128578",- ];-- return emojis[Math.floor(Math.random() * emojis.length)];-};-export const renderEmoji = (emoji:| stringdiff --git a/space/helpers/issue.helper.ts b/space/helpers/issue.helper.tsnew file mode 100644index 0000000000..a5159edef2--- /dev/null+++ b/space/helpers/issue.helper.ts@@ -0,0 +1,30 @@+import { differenceInCalendarDays } from "date-fns";+// types+import { TStateGroups } from "@plane/types";+// constants+import { STATE_GROUPS } from "@/constants/state";+// helpers+import { getDate } from "@/helpers/date-time.helper";++/**+ * @description check if the issue due date should be highlighted+ * @param date+ * @param stateGroup+ * @returns boolean+ */+export const shouldHighlightIssueDueDate = (+ date: string | Date | null,+ stateGroup: TStateGroups | undefined+): boolean => {+ if (!date || !stateGroup) return false;+ // if the issue is completed or cancelled, don't highlight the due date+ if ([STATE_GROUPS.completed.key, STATE_GROUPS.cancelled.key].includes(stateGroup)) return false;++ const parsedDate = getDate(date);+ if (!parsedDate) return false;++ const targetDateDistance = differenceInCalendarDays(parsedDate, new Date());++ // if the issue is overdue, highlight the due date+ return targetDateDistance <= 0;+};diff --git a/space/helpers/string.helper.ts b/space/helpers/string.helper.tsindex 525a9fc99d..f6319bc750 100644--- a/space/helpers/string.helper.ts+++ b/space/helpers/string.helper.ts@@ -3,7 +3,7 @@ import DOMPurify from "dompurify";export const addSpaceIfCamelCase = (str: string) => str.replace(/([a-z])([A-Z])/g, "$1 $2");const fallbackCopyTextToClipboard = (text: string) => {- var textArea = document.createElement("textarea");+ const textArea = document.createElement("textarea");textArea.value = text;// Avoid scrolling to bottom@@ -18,7 +18,7 @@ const fallbackCopyTextToClipboard = (text: string) => {try {// FIXME: Even though we are using this as a fallback, execCommand is deprecated π. We should find a better way to do this.// https://developer.mozilla.org/en-US/docs/Web/API/Document/execCommand- var successful = document.execCommand("copy");+ document.execCommand("copy");} catch (err) {}document.body.removeChild(textArea);diff --git a/space/hooks/store/index.ts b/space/hooks/store/index.tsindex 76b6f93154..3f82613d56 100644--- a/space/hooks/store/index.ts+++ b/space/hooks/store/index.ts@@ -1,5 +1,5 @@+export * from "./publish";export * from "./use-instance";-export * from "./use-project";export * from "./use-issue";export * from "./use-user";export * from "./use-user-profile";diff --git a/space/hooks/store/publish/index.ts b/space/hooks/store/publish/index.tsnew file mode 100644index 0000000000..a7b42ad5bb--- /dev/null+++ b/space/hooks/store/publish/index.ts@@ -0,0 +1,2 @@+export * from "./use-publish-list";+export * from "./use-publish";diff --git a/space/hooks/store/publish/use-publish-list.ts b/space/hooks/store/publish/use-publish-list.tsnew file mode 100644index 0000000000..aa50c295a3--- /dev/null+++ b/space/hooks/store/publish/use-publish-list.ts@@ -0,0 +1,11 @@+import { useContext } from "react";+// lib+import { StoreContext } from "@/lib/store-provider";+// store+import { IPublishListStore } from "@/store/publish/publish_list.store";++export const usePublishList = (): IPublishListStore => {+ const context = useContext(StoreContext);+ if (context === undefined) throw new Error("usePublishList must be used within StoreProvider");+ return context.publishList;+};diff --git a/space/hooks/store/publish/use-publish.ts b/space/hooks/store/publish/use-publish.tsnew file mode 100644index 0000000000..3d920e8cb3--- /dev/null+++ b/space/hooks/store/publish/use-publish.ts@@ -0,0 +1,11 @@+import { useContext } from "react";+// lib+import { StoreContext } from "@/lib/store-provider";+// store+import { PublishStore } from "@/store/publish/publish.store";++export const usePublish = (anchor: string): PublishStore => {+ const context = useContext(StoreContext);+ if (context === undefined) throw new Error("usePublish must be used within StoreProvider");+ return context.publishList.publishMap?.[anchor] ?? {};+};diff --git a/space/hooks/store/use-project.ts b/space/hooks/store/use-project.tsdeleted file mode 100644index cd3e289586..0000000000--- a/space/hooks/store/use-project.ts+++ /dev/null@@ -1,11 +0,0 @@-import { useContext } from "react";-// lib-import { StoreContext } from "@/lib/store-provider";-// store-import { IProjectStore } from "@/store/project.store";--export const useProject = (): IProjectStore => {- const context = useContext(StoreContext);- if (context === undefined) throw new Error("useUserProfile must be used within StoreProvider");- return context.project;-};diff --git a/space/hooks/use-mention.tsx b/space/hooks/use-mention.tsxindex 8b2d697203..9e33f7d904 100644--- a/space/hooks/use-mention.tsx+++ b/space/hooks/use-mention.tsx@@ -1,7 +1,9 @@import { useRef, useEffect } from "react";import useSWR from "swr";+// typesimport { IUser } from "@plane/types";-import { UserService } from "services/user.service";+// services+import { UserService } from "@/services/user.service";export const useMention = () => {const userService = new UserService();diff --git a/space/lib/user-provider.tsx b/space/lib/user-provider.tsxdeleted file mode 100644index 1ac1c786c3..0000000000--- a/space/lib/user-provider.tsx+++ /dev/null@@ -1,12 +0,0 @@-import { ReactNode } from "react";-import { observer } from "mobx-react-lite";-import useSWR from "swr";-import { useUser } from "@/hooks/store";--export const UserProvider = observer(({ children }: { children: ReactNode }) => {- const { fetchCurrentUser } = useUser();-- useSWR("CURRENT_USER", () => fetchCurrentUser());-- return <>{children}</>;-});diff --git a/space/package.json b/space/package.jsonindex e3dadbff8e..0932d7abfd 100644--- a/space/package.json+++ b/space/package.json@@ -26,6 +26,7 @@"@sentry/nextjs": "^8","axios": "^1.3.4","clsx": "^2.0.0",+ "date-fns": "^3.6.0","dompurify": "^3.0.11","dotenv": "^16.3.1","js-cookie": "^3.0.1",diff --git a/space/services/file.service.ts b/space/services/file.service.tsindex 0e277af1e2..9fe06cd364 100644--- a/space/services/file.service.ts+++ b/space/services/file.service.ts@@ -4,30 +4,6 @@ import { API_BASE_URL } from "@/helpers/common.helper";// servicesimport { APIService } from "@/services/api.service";-interface UnSplashImage {- id: string;- created_at: Date;- updated_at: Date;- promoted_at: Date;- width: number;- height: number;- color: string;- blur_hash: string;- description: null;- alt_description: string;- urls: UnSplashImageUrls;- [key: string]: any;-}--interface UnSplashImageUrls {- raw: string;- full: string;- regular: string;- small: string;- thumb: string;- small_s3: string;-}-class FileService extends APIService {private cancelSource: any;@@ -123,40 +99,6 @@ class FileService extends APIService {throw error?.response?.data;});}-- async deleteFile(workspaceId: string, assetUrl: string): Promise<any> {- const lastIndex = assetUrl.lastIndexOf("/");- const assetId = assetUrl.substring(lastIndex + 1);-- return this.delete(`/api/workspaces/file-assets/${workspaceId}/${assetId}/`)- .then((response) => response?.data)- .catch((error) => {- throw error?.response?.data;- });- }-- async uploadUserFile(file: FormData): Promise<any> {- return this.post(`/api/users/file-assets/`, file, {- headers: {- "Content-Type": "multipart/form-data",- },- })- .then((response) => response?.data)- .catch((error) => {- throw error?.response?.data;- });- }-- async deleteUserFile(assetUrl: string): Promise<any> {- const lastIndex = assetUrl.lastIndexOf("/");- const assetId = assetUrl.substring(lastIndex + 1);-- return this.delete(`/api/users/file-assets/${assetId}`)- .then((response) => response?.data)- .catch((error) => {- throw error?.response?.data;- });- }}const fileService = new FileService();diff --git a/space/services/issue.service.ts b/space/services/issue.service.tsindex 1913b678e0..f864818126 100644--- a/space/services/issue.service.ts+++ b/space/services/issue.service.ts@@ -1,14 +1,16 @@import { API_BASE_URL } from "@/helpers/common.helper";// servicesimport { APIService } from "@/services/api.service";+// types+import { TIssuesResponse } from "@/types/issue";class IssueService extends APIService {constructor() {super(API_BASE_URL);}- async getPublicIssues(workspace_slug: string, project_slug: string, params: any): Promise<any> {- return this.get(`/api/public/workspaces/${workspace_slug}/project-boards/${project_slug}/issues/`, {+ async fetchPublicIssues(anchor: string, params: any): Promise<TIssuesResponse> {+ return this.get(`/api/public/anchor/${anchor}/issues/`, {params,}).then((response) => response?.data)@@ -17,115 +19,88 @@ class IssueService extends APIService {});}- async getIssueById(workspaceSlug: string, projectId: string, issueId: string): Promise<any> {- return this.get(`/api/public/workspaces/${workspaceSlug}/project-boards/${projectId}/issues/${issueId}/`)+ async getIssueById(anchor: string, issueID: string): Promise<any> {+ return this.get(`/api/public/anchor/${anchor}/issues/${issueID}/`).then((response) => response?.data).catch((error) => {throw error?.response;});}- async getIssueVotes(workspaceSlug: string, projectId: string, issueId: string): Promise<any> {- return this.get(`/api/public/workspaces/${workspaceSlug}/project-boards/${projectId}/issues/${issueId}/votes/`)+ async getIssueVotes(anchor: string, issueID: string): Promise<any> {+ return this.get(`/api/public/anchor/${anchor}/issues/${issueID}/votes/`).then((response) => response?.data).catch((error) => {throw error?.response;});}- async createIssueVote(workspaceSlug: string, projectId: string, issueId: string, data: any): Promise<any> {- return this.post(- `/api/public/workspaces/${workspaceSlug}/project-boards/${projectId}/issues/${issueId}/votes/`,- data- )+ async createIssueVote(anchor: string, issueID: string, data: any): Promise<any> {+ return this.post(`/api/public/anchor/${anchor}/issues/${issueID}/votes/`, data).then((response) => response?.data).catch((error) => {throw error?.response;});}- async deleteIssueVote(workspaceSlug: string, projectId: string, issueId: string): Promise<any> {- return this.delete(`/api/public/workspaces/${workspaceSlug}/project-boards/${projectId}/issues/${issueId}/votes/`)+ async deleteIssueVote(anchor: string, issueID: string): Promise<any> {+ return this.delete(`/api/public/anchor/${anchor}/issues/${issueID}/votes/`).then((response) => response?.data).catch((error) => {throw error?.response;});}- async getIssueReactions(workspaceSlug: string, projectId: string, issueId: string): Promise<any> {- return this.get(`/api/public/workspaces/${workspaceSlug}/project-boards/${projectId}/issues/${issueId}/reactions/`)+ async getIssueReactions(anchor: string, issueID: string): Promise<any> {+ return this.get(`/api/public/anchor/${anchor}/issues/${issueID}/reactions/`).then((response) => response?.data).catch((error) => {throw error?.response;});}- async createIssueReaction(workspaceSlug: string, projectId: string, issueId: string, data: any): Promise<any> {- return this.post(- `/api/public/workspaces/${workspaceSlug}/project-boards/${projectId}/issues/${issueId}/reactions/`,- data- )+ async createIssueReaction(anchor: string, issueID: string, data: any): Promise<any> {+ return this.post(`/api/public/anchor/${anchor}/issues/${issueID}/reactions/`, data).then((response) => response?.data).catch((error) => {throw error?.response;});}- async deleteIssueReaction(- workspaceSlug: string,- projectId: string,- issueId: string,- reactionId: string- ): Promise<any> {- return this.delete(- `/api/public/workspaces/${workspaceSlug}/project-boards/${projectId}/issues/${issueId}/reactions/${reactionId}/`- )+ async deleteIssueReaction(anchor: string, issueID: string, reactionId: string): Promise<any> {+ return this.delete(`/api/public/anchor/${anchor}/issues/${issueID}/reactions/${reactionId}/`).then((response) => response?.data).catch((error) => {throw error?.response;});}- async getIssueComments(workspaceSlug: string, projectId: string, issueId: string): Promise<any> {- return this.get(`/api/public/workspaces/${workspaceSlug}/project-boards/${projectId}/issues/${issueId}/comments/`)+ async getIssueComments(anchor: string, issueID: string): Promise<any> {+ return this.get(`/api/public/anchor/${anchor}/issues/${issueID}/comments/`).then((response) => response?.data).catch((error) => {throw error?.response;});}- async createIssueComment(workspaceSlug: string, projectId: string, issueId: string, data: any): Promise<any> {- return this.post(- `/api/public/workspaces/${workspaceSlug}/project-boards/${projectId}/issues/${issueId}/comments/`,- data- )+ async createIssueComment(anchor: string, issueID: string, data: any): Promise<any> {+ return this.post(`/api/public/anchor/${anchor}/issues/${issueID}/comments/`, data).then((response) => response?.data).catch((error) => {throw error?.response;});}- async updateIssueComment(- workspaceSlug: string,- projectId: string,- issueId: string,- commentId: string,- data: any- ): Promise<any> {- return this.patch(- `/api/public/workspaces/${workspaceSlug}/project-boards/${projectId}/issues/${issueId}/comments/${commentId}/`,- data- )+ async updateIssueComment(anchor: string, issueID: string, commentId: string, data: any): Promise<any> {+ return this.patch(`/api/public/anchor/${anchor}/issues/${issueID}/comments/${commentId}/`, data).then((response) => response?.data).catch((error) => {throw error?.response;});}- async deleteIssueComment(workspaceSlug: string, projectId: string, issueId: string, commentId: string): Promise<any> {- return this.delete(- `/api/public/workspaces/${workspaceSlug}/project-boards/${projectId}/issues/${issueId}/comments/${commentId}/`- )+ async deleteIssueComment(anchor: string, issueID: string, commentId: string): Promise<any> {+ return this.delete(`/api/public/anchor/${anchor}/issues/${issueID}/comments/${commentId}/`).then((response) => response?.data).catch((error) => {throw error?.response;@@ -133,32 +108,21 @@ class IssueService extends APIService {}async createCommentReaction(- workspaceSlug: string,- projectId: string,+ anchor: string,commentId: string,data: {reaction: string;}): Promise<any> {- return this.post(- `/api/public/workspaces/${workspaceSlug}/project-boards/${projectId}/comments/${commentId}/reactions/`,- data- )+ return this.post(`/api/public/anchor/${anchor}/comments/${commentId}/reactions/`, data).then((response) => response?.data).catch((error) => {throw error?.response;});}- async deleteCommentReaction(- workspaceSlug: string,- projectId: string,- commentId: string,- reactionHex: string- ): Promise<any> {- return this.delete(- `/api/public/workspaces/${workspaceSlug}/project-boards/${projectId}/comments/${commentId}/reactions/${reactionHex}/`- )+ async deleteCommentReaction(anchor: string, commentId: string, reactionHex: string): Promise<any> {+ return this.delete(`/api/public/anchor/${anchor}/comments/${commentId}/reactions/${reactionHex}/`).then((response) => response?.data).catch((error) => {throw error?.response;diff --git a/space/services/project-member.service.ts b/space/services/project-member.service.tsindex 264d533869..722380efaf 100644--- a/space/services/project-member.service.ts+++ b/space/services/project-member.service.ts@@ -9,16 +9,16 @@ export class ProjectMemberService extends APIService {super(API_BASE_URL);}- async fetchProjectMembers(workspaceSlug: string, projectId: string): Promise<IProjectMembership[]> {- return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/members/`)+ async fetchProjectMembers(anchor: string): Promise<IProjectMembership[]> {+ return this.get(`/api/anchor/${anchor}/members/`).then((response) => response?.data).catch((error) => {throw error?.response?.data;});}- async getProjectMember(workspaceSlug: string, projectId: string, memberId: string): Promise<IProjectMember> {- return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/members/${memberId}/`)+ async getProjectMember(anchor: string, memberID: string): Promise<IProjectMember> {+ return this.get(`/api/anchor/${anchor}/members/${memberID}/`).then((response) => response?.data).catch((error) => {throw error?.response?.data;diff --git a/space/services/project.service.ts b/space/services/project.service.tsdeleted file mode 100644index 14ed7837b3..0000000000--- a/space/services/project.service.ts+++ /dev/null@@ -1,19 +0,0 @@-import { API_BASE_URL } from "@/helpers/common.helper";-// services-import { APIService } from "@/services/api.service";--class ProjectService extends APIService {- constructor() {- super(API_BASE_URL);- }-- async getProjectSettings(workspace_slug: string, project_slug: string): Promise<any> {- return this.get(`/api/public/workspaces/${workspace_slug}/project-boards/${project_slug}/settings/`)- .then((response) => response?.data)- .catch((error) => {- throw error?.response;- });- }-}--export default ProjectService;diff --git a/space/services/publish.service.ts b/space/services/publish.service.tsnew file mode 100644index 0000000000..0275142c89--- /dev/null+++ b/space/services/publish.service.ts@@ -0,0 +1,30 @@+// types+import { TPublishSettings } from "@plane/types";+// helpers+import { API_BASE_URL } from "@/helpers/common.helper";+// services+import { APIService } from "@/services/api.service";++class PublishService extends APIService {+ constructor() {+ super(API_BASE_URL);+ }++ async fetchPublishSettings(anchor: string): Promise<TPublishSettings> {+ return this.get(`/api/public/anchor/${anchor}/settings/`)+ .then((response) => response?.data)+ .catch((error) => {+ throw error?.response;+ });+ }++ async fetchAnchorFromProjectDetails(workspaceSlug: string, projectID: string): Promise<TPublishSettings> {+ return this.get(`/api/public/workspaces/${workspaceSlug}/projects/${projectID}/anchor/`)+ .then((response) => response?.data)+ .catch((error) => {+ throw error?.response;+ });+ }+}++export default PublishService;diff --git a/space/store/issue-detail.store.ts b/space/store/issue-detail.store.tsindex 03f611cc0a..672fe29ad2 100644--- a/space/store/issue-detail.store.ts+++ b/space/store/issue-detail.store.ts@@ -10,108 +10,102 @@ import { IIssue, IPeekMode, IVote } from "@/types/issue";export interface IIssueDetailStore {loader: boolean;error: any;- // peek info+ // observablespeekId: string | null;peekMode: IPeekMode;details: {[key: string]: IIssue;};- // peek actions- setPeekId: (issueId: string | null) => void;+ // actions+ setPeekId: (issueID: string | null) => void;setPeekMode: (mode: IPeekMode) => void;- // issue details- fetchIssueDetails: (workspaceId: string, projectId: string, issueId: string) => void;- // issue comments- addIssueComment: (workspaceId: string, projectId: string, issueId: string, data: any) => Promise<void>;- updateIssueComment: (- workspaceId: string,- projectId: string,- issueId: string,- comment_id: string,- data: any- ) => Promise<any>;- deleteIssueComment: (workspaceId: string, projectId: string, issueId: string, comment_id: string) => void;- addCommentReaction: (- workspaceId: string,- projectId: string,- issueId: string,- commentId: string,- reactionHex: string- ) => void;- removeCommentReaction: (- workspaceId: string,- projectId: string,- issueId: string,- commentId: string,- reactionHex: string- ) => void;- // issue reactions- addIssueReaction: (workspaceId: string, projectId: string, issueId: string, reactionHex: string) => void;- removeIssueReaction: (workspaceId: string, projectId: string, issueId: string, reactionHex: string) => void;- // issue votes- addIssueVote: (workspaceId: string, projectId: string, issueId: string, data: { vote: 1 | -1 }) => Promise<void>;- removeIssueVote: (workspaceId: string, projectId: string, issueId: string) => Promise<void>;+ // issue actions+ fetchIssueDetails: (anchor: string, issueID: string) => void;+ // comment actions+ addIssueComment: (anchor: string, issueID: string, data: any) => Promise<void>;+ updateIssueComment: (anchor: string, issueID: string, commentID: string, data: any) => Promise<any>;+ deleteIssueComment: (anchor: string, issueID: string, commentID: string) => void;+ addCommentReaction: (anchor: string, issueID: string, commentID: string, reactionHex: string) => void;+ removeCommentReaction: (anchor: string, issueID: string, commentID: string, reactionHex: string) => void;+ // reaction actions+ addIssueReaction: (anchor: string, issueID: string, reactionHex: string) => void;+ removeIssueReaction: (anchor: string, issueID: string, reactionHex: string) => void;+ // vote actions+ addIssueVote: (anchor: string, issueID: string, data: { vote: 1 | -1 }) => Promise<void>;+ removeIssueVote: (anchor: string, issueID: string) => Promise<void>;}export class IssueDetailStore implements IIssueDetailStore {loader: boolean = false;error: any = null;+ // observablespeekId: string | null = null;peekMode: IPeekMode = "side";details: {[key: string]: IIssue;} = {};- issueService;+ // root storerootStore: RootStore;+ // services+ issueService: IssueService;constructor(_rootStore: RootStore) {makeObservable(this, {loader: observable.ref,error: observable.ref,- // peek+ // observablespeekId: observable.ref,peekMode: observable.ref,- details: observable.ref,+ details: observable,// actionssetPeekId: action,setPeekMode: action,+ // issue actionsfetchIssueDetails: action,+ // comment actionsaddIssueComment: action,updateIssueComment: action,deleteIssueComment: action,addCommentReaction: action,removeCommentReaction: action,+ // reaction actionsaddIssueReaction: action,removeIssueReaction: action,+ // vote actionsaddIssueVote: action,removeIssueVote: action,});- this.issueService = new IssueService();this.rootStore = _rootStore;+ this.issueService = new IssueService();}- setPeekId = (issueId: string | null) => {- this.peekId = issueId;+ setPeekId = (issueID: string | null) => {+ this.peekId = issueID;};setPeekMode = (mode: IPeekMode) => {this.peekMode = mode;};- fetchIssueDetails = async (workspaceSlug: string, projectId: string, issueId: string) => {+ /**+ * @description fetc+ * @param {string} anchor+ * @param {string} issueID+ */+ fetchIssueDetails = async (anchor: string, issueID: string) => {try {this.loader = true;this.error = null;- const issueDetails = this.rootStore.issue.issues?.find((i) => i.id === issueId);- const commentsResponse = await this.issueService.getIssueComments(workspaceSlug, projectId, issueId);+ const issueDetails = this.rootStore.issue.issues?.find((i) => i.id === issueID);+ const commentsResponse = await this.issueService.getIssueComments(anchor, issueID);if (issueDetails) {runInAction(() => {this.details = {...this.details,- [issueId]: {- ...(this.details[issueId] ?? issueDetails),+ [issueID]: {+ ...(this.details[issueID] ?? issueDetails),comments: commentsResponse,},};@@ -123,17 +117,17 @@ export class IssueDetailStore implements IIssueDetailStore {}};- addIssueComment = async (workspaceSlug: string, projectId: string, issueId: string, data: any) => {+ addIssueComment = async (anchor: string, issueID: string, data: any) => {try {- const issueDetails = this.rootStore.issue.issues?.find((i) => i.id === issueId);- const issueCommentResponse = await this.issueService.createIssueComment(workspaceSlug, projectId, issueId, data);+ const issueDetails = this.rootStore.issue.issues?.find((i) => i.id === issueID);+ const issueCommentResponse = await this.issueService.createIssueComment(anchor, issueID, data);if (issueDetails) {runInAction(() => {this.details = {...this.details,- [issueId]: {+ [issueID]: {...issueDetails,- comments: [...this.details[issueId].comments, issueCommentResponse],+ comments: [...this.details[issueID].comments, issueCommentResponse],},};});@@ -145,36 +139,30 @@ export class IssueDetailStore implements IIssueDetailStore {}};- updateIssueComment = async (- workspaceSlug: string,- projectId: string,- issueId: string,- commentId: string,- data: any- ) => {+ updateIssueComment = async (anchor: string, issueID: string, commentID: string, data: any) => {try {runInAction(() => {this.details = {...this.details,- [issueId]: {- ...this.details[issueId],- comments: this.details[issueId].comments.map((c) => ({+ [issueID]: {+ ...this.details[issueID],+ comments: this.details[issueID].comments.map((c) => ({...c,- ...(c.id === commentId ? data : {}),+ ...(c.id === commentID ? data : {}),})),},};});- await this.issueService.updateIssueComment(workspaceSlug, projectId, issueId, commentId, data);+ await this.issueService.updateIssueComment(anchor, issueID, commentID, data);} catch (error) {- const issueComments = await this.issueService.getIssueComments(workspaceSlug, projectId, issueId);+ const issueComments = await this.issueService.getIssueComments(anchor, issueID);runInAction(() => {this.details = {...this.details,- [issueId]: {- ...this.details[issueId],+ [issueID]: {+ ...this.details[issueID],comments: issueComments,},};@@ -182,15 +170,15 @@ export class IssueDetailStore implements IIssueDetailStore {}};- deleteIssueComment = async (workspaceSlug: string, projectId: string, issueId: string, comment_id: string) => {+ deleteIssueComment = async (anchor: string, issueID: string, commentID: string) => {try {- await this.issueService.deleteIssueComment(workspaceSlug, projectId, issueId, comment_id);- const remainingComments = this.details[issueId].comments.filter((c) => c.id != comment_id);+ await this.issueService.deleteIssueComment(anchor, issueID, commentID);+ const remainingComments = this.details[issueID].comments.filter((c) => c.id != commentID);runInAction(() => {this.details = {...this.details,- [issueId]: {- ...this.details[issueId],+ [issueID]: {+ ...this.details[issueID],comments: remainingComments,},};@@ -200,47 +188,41 @@ export class IssueDetailStore implements IIssueDetailStore {}};- addCommentReaction = async (- workspaceSlug: string,- projectId: string,- issueId: string,- commentId: string,- reactionHex: string- ) => {+ addCommentReaction = async (anchor: string, issueID: string, commentID: string, reactionHex: string) => {const newReaction = {id: uuidv4(),- comment: commentId,+ comment: commentID,reaction: reactionHex,actor_detail: this.rootStore.user.currentActor,};- const newComments = this.details[issueId].comments.map((comment) => ({+ const newComments = this.details[issueID].comments.map((comment) => ({...comment,comment_reactions:- comment.id === commentId ? [...comment.comment_reactions, newReaction] : comment.comment_reactions,+ comment.id === commentID ? [...comment.comment_reactions, newReaction] : comment.comment_reactions,}));try {runInAction(() => {this.details = {...this.details,- [issueId]: {- ...this.details[issueId],+ [issueID]: {+ ...this.details[issueID],comments: [...newComments],},};});- await this.issueService.createCommentReaction(workspaceSlug, projectId, commentId, {+ await this.issueService.createCommentReaction(anchor, commentID, {reaction: reactionHex,});} catch (error) {- const issueComments = await this.issueService.getIssueComments(workspaceSlug, projectId, issueId);+ const issueComments = await this.issueService.getIssueComments(anchor, issueID);runInAction(() => {this.details = {...this.details,- [issueId]: {- ...this.details[issueId],+ [issueID]: {+ ...this.details[issueID],comments: issueComments,},};@@ -248,39 +230,33 @@ export class IssueDetailStore implements IIssueDetailStore {}};- removeCommentReaction = async (- workspaceSlug: string,- projectId: string,- issueId: string,- commentId: string,- reactionHex: string- ) => {+ removeCommentReaction = async (anchor: string, issueID: string, commentID: string, reactionHex: string) => {try {- const comment = this.details[issueId].comments.find((c) => c.id === commentId);+ const comment = this.details[issueID].comments.find((c) => c.id === commentID);const newCommentReactions = comment?.comment_reactions.filter((r) => r.reaction !== reactionHex) ?? [];runInAction(() => {this.details = {...this.details,- [issueId]: {- ...this.details[issueId],- comments: this.details[issueId].comments.map((c) => ({+ [issueID]: {+ ...this.details[issueID],+ comments: this.details[issueID].comments.map((c) => ({...c,- comment_reactions: c.id === commentId ? newCommentReactions : c.comment_reactions,+ comment_reactions: c.id === commentID ? newCommentReactions : c.comment_reactions,})),},};});- await this.issueService.deleteCommentReaction(workspaceSlug, projectId, commentId, reactionHex);+ await this.issueService.deleteCommentReaction(anchor, commentID, reactionHex);} catch (error) {- const issueComments = await this.issueService.getIssueComments(workspaceSlug, projectId, issueId);+ const issueComments = await this.issueService.getIssueComments(anchor, issueID);runInAction(() => {this.details = {...this.details,- [issueId]: {- ...this.details[issueId],+ [issueID]: {+ ...this.details[issueID],comments: issueComments,},};@@ -288,18 +264,18 @@ export class IssueDetailStore implements IIssueDetailStore {}};- addIssueReaction = async (workspaceSlug: string, projectId: string, issueId: string, reactionHex: string) => {+ addIssueReaction = async (anchor: string, issueID: string, reactionHex: string) => {try {runInAction(() => {this.details = {...this.details,- [issueId]: {- ...this.details[issueId],+ [issueID]: {+ ...this.details[issueID],reactions: [- ...this.details[issueId].reactions,+ ...this.details[issueID].reactions,{id: uuidv4(),- issue: issueId,+ issue: issueID,reaction: reactionHex,actor_detail: this.rootStore.user.currentActor,},@@ -308,17 +284,17 @@ export class IssueDetailStore implements IIssueDetailStore {};});- await this.issueService.createIssueReaction(workspaceSlug, projectId, issueId, {+ await this.issueService.createIssueReaction(anchor, issueID, {reaction: reactionHex,});} catch (error) {console.log("Failed to add issue vote");- const issueReactions = await this.issueService.getIssueReactions(workspaceSlug, projectId, issueId);+ const issueReactions = await this.issueService.getIssueReactions(anchor, issueID);runInAction(() => {this.details = {...this.details,- [issueId]: {- ...this.details[issueId],+ [issueID]: {+ ...this.details[issueID],reactions: issueReactions,},};@@ -326,31 +302,31 @@ export class IssueDetailStore implements IIssueDetailStore {}};- removeIssueReaction = async (workspaceSlug: string, projectId: string, issueId: string, reactionHex: string) => {+ removeIssueReaction = async (anchor: string, issueID: string, reactionHex: string) => {try {- const newReactions = this.details[issueId].reactions.filter(+ const newReactions = this.details[issueID].reactions.filter((_r) => !(_r.reaction === reactionHex && _r.actor_detail.id === this.rootStore.user.data?.id));runInAction(() => {this.details = {...this.details,- [issueId]: {- ...this.details[issueId],+ [issueID]: {+ ...this.details[issueID],reactions: newReactions,},};});- await this.issueService.deleteIssueReaction(workspaceSlug, projectId, issueId, reactionHex);+ await this.issueService.deleteIssueReaction(anchor, issueID, reactionHex);} catch (error) {console.log("Failed to remove issue reaction");- const reactions = await this.issueService.getIssueReactions(workspaceSlug, projectId, issueId);+ const reactions = await this.issueService.getIssueReactions(anchor, issueID);runInAction(() => {this.details = {...this.details,- [issueId]: {- ...this.details[issueId],+ [issueID]: {+ ...this.details[issueID],reactions: reactions,},};@@ -358,39 +334,44 @@ export class IssueDetailStore implements IIssueDetailStore {}};- addIssueVote = async (workspaceSlug: string, projectId: string, issueId: string, data: { vote: 1 | -1 }) => {+ addIssueVote = async (anchor: string, issueID: string, data: { vote: 1 | -1 }) => {+ const publishSettings = this.rootStore.publishList?.publishMap?.[anchor];+ const projectID = publishSettings?.project;+ const workspaceSlug = publishSettings?.workspace_detail?.slug;+ if (!projectID || !workspaceSlug) throw new Error("Publish settings not found");+const newVote: IVote = {actor: this.rootStore.user.data?.id ?? "",actor_detail: this.rootStore.user.currentActor,- issue: issueId,- project: projectId,+ issue: issueID,+ project: projectID,workspace: workspaceSlug,vote: data.vote,};- const filteredVotes = this.details[issueId].votes.filter((v) => v.actor !== this.rootStore.user.data?.id);+ const filteredVotes = this.details[issueID].votes.filter((v) => v.actor !== this.rootStore.user.data?.id);try {runInAction(() => {this.details = {...this.details,- [issueId]: {- ...this.details[issueId],+ [issueID]: {+ ...this.details[issueID],votes: [...filteredVotes, newVote],},};});- await this.issueService.createIssueVote(workspaceSlug, projectId, issueId, data);+ await this.issueService.createIssueVote(anchor, issueID, data);} catch (error) {console.log("Failed to add issue vote");- const issueVotes = await this.issueService.getIssueVotes(workspaceSlug, projectId, issueId);+ const issueVotes = await this.issueService.getIssueVotes(anchor, issueID);runInAction(() => {this.details = {...this.details,- [issueId]: {- ...this.details[issueId],+ [issueID]: {+ ...this.details[issueID],votes: issueVotes,},};@@ -398,30 +379,30 @@ export class IssueDetailStore implements IIssueDetailStore {}};- removeIssueVote = async (workspaceSlug: string, projectId: string, issueId: string) => {- const newVotes = this.details[issueId].votes.filter((v) => v.actor !== this.rootStore.user.data?.id);+ removeIssueVote = async (anchor: string, issueID: string) => {+ const newVotes = this.details[issueID].votes.filter((v) => v.actor !== this.rootStore.user.data?.id);try {runInAction(() => {this.details = {...this.details,- [issueId]: {- ...this.details[issueId],+ [issueID]: {+ ...this.details[issueID],votes: newVotes,},};});- await this.issueService.deleteIssueVote(workspaceSlug, projectId, issueId);+ await this.issueService.deleteIssueVote(anchor, issueID);} catch (error) {console.log("Failed to remove issue vote");- const issueVotes = await this.issueService.getIssueVotes(workspaceSlug, projectId, issueId);+ const issueVotes = await this.issueService.getIssueVotes(anchor, issueID);runInAction(() => {this.details = {...this.details,- [issueId]: {- ...this.details[issueId],+ [issueID]: {+ ...this.details[issueID],votes: issueVotes,},};diff --git a/space/store/issue-filters.store.ts b/space/store/issue-filters.store.tsindex b7b311af45..daf797f90e 100644--- a/space/store/issue-filters.store.ts+++ b/space/store/issue-filters.store.ts@@ -1,7 +1,7 @@import cloneDeep from "lodash/cloneDeep";import isEqual from "lodash/isEqual";import set from "lodash/set";-import { action, makeObservable, observable, runInAction, computed } from "mobx";+import { action, makeObservable, observable, runInAction } from "mobx";import { computedFn } from "mobx-utils";// constantsimport { ISSUE_DISPLAY_FILTERS_BY_LAYOUT } from "@/constants/issue";@@ -19,16 +19,17 @@ import {export interface IIssueFilterStore {// observableslayoutOptions: TIssueLayoutOptions;- filters: { [projectId: string]: TIssueFilters } | undefined;+ filters: { [anchor: string]: TIssueFilters } | undefined;// computed- issueFilters: TIssueFilters | undefined;- appliedFilters: TIssueQueryFiltersParams | undefined;- isIssueFiltersUpdated: (filters: TIssueFilters) => boolean;+ isIssueFiltersUpdated: (anchor: string, filters: TIssueFilters) => boolean;+ // helpers+ getIssueFilters: (anchor: string) => TIssueFilters | undefined;+ getAppliedFilters: (anchor: string) => TIssueQueryFiltersParams | undefined;// actionsupdateLayoutOptions: (layout: TIssueLayoutOptions) => void;- initIssueFilters: (projectId: string, filters: TIssueFilters) => void;+ initIssueFilters: (anchor: string, filters: TIssueFilters) => void;updateIssueFilters: <K extends keyof TIssueFilters>(- projectId: string,+ anchor: string,filterKind: K,filterKey: keyof TIssueFilters[K],filters: TIssueFilters[K][typeof filterKey]@@ -44,16 +45,13 @@ export class IssueFilterStore implements IIssueFilterStore {gantt: false,spreadsheet: false,};- filters: { [projectId: string]: TIssueFilters } | undefined = undefined;+ filters: { [anchor: string]: TIssueFilters } | undefined = undefined;constructor(private store: RootStore) {makeObservable(this, {// observableslayoutOptions: observable,filters: observable,- // computed- issueFilters: computed,- appliedFilters: computed,// actionsupdateLayoutOptions: action,initIssueFilters: action,@@ -82,79 +80,70 @@ export class IssueFilterStore implements IIssueFilterStore {};// computed- get issueFilters() {- const projectId = this.store.project.project?.id;- if (!projectId) return undefined;-- const currentFilters = this.filters?.[projectId];- if (!currentFilters) return undefined;-+ getIssueFilters = computedFn((anchor: string) => {+ const currentFilters = this.filters?.[anchor];return currentFilters;- }+ });- get appliedFilters() {- const currentIssueFilters = this.issueFilters;- if (!currentIssueFilters) return undefined;+ getAppliedFilters = computedFn((anchor: string) => {+ const issueFilters = this.getIssueFilters(anchor);+ if (!issueFilters) return undefined;- const currentLayout = currentIssueFilters?.display_filters?.layout;+ const currentLayout = issueFilters?.display_filters?.layout;if (!currentLayout) return undefined;const currentFilters: TIssueQueryFilters = {- priority: currentIssueFilters?.filters?.priority || undefined,- state: currentIssueFilters?.filters?.state || undefined,- labels: currentIssueFilters?.filters?.labels || undefined,+ priority: issueFilters?.filters?.priority || undefined,+ state: issueFilters?.filters?.state || undefined,+ labels: issueFilters?.filters?.labels || undefined,};const filteredParams = ISSUE_DISPLAY_FILTERS_BY_LAYOUT?.[currentLayout]?.filters || [];const currentFilterQueryParams: TIssueQueryFiltersParams = this.computedFilter(currentFilters, filteredParams);return currentFilterQueryParams;- }+ });- isIssueFiltersUpdated = computedFn((userFilters: TIssueFilters) => {- if (!this.issueFilters) return false;+ isIssueFiltersUpdated = computedFn((anchor: string, userFilters: TIssueFilters) => {+ const issueFilters = this.getIssueFilters(anchor);+ if (!issueFilters) return false;const currentUserFilters = cloneDeep(userFilters?.filters || {});- const currentIssueFilters = cloneDeep(this.issueFilters?.filters || {});+ const currentIssueFilters = cloneDeep(issueFilters?.filters || {});return isEqual(currentUserFilters, currentIssueFilters);});// actionsupdateLayoutOptions = (options: TIssueLayoutOptions) => set(this, ["layoutOptions"], options);- initIssueFilters = async (projectId: string, initFilters: TIssueFilters) => {+ initIssueFilters = async (anchor: string, initFilters: TIssueFilters) => {try {- if (!projectId) return;if (this.filters === undefined) runInAction(() => (this.filters = {}));- if (this.filters && initFilters) set(this.filters, [projectId], initFilters);+ if (this.filters && initFilters) set(this.filters, [anchor], initFilters);- const workspaceSlug = this.store.project.workspace?.slug;- const currentAppliedFilters = this.appliedFilters;+ const appliedFilters = this.getAppliedFilters(anchor);- if (!workspaceSlug) return;- await this.store.issue.fetchPublicIssues(workspaceSlug, projectId, currentAppliedFilters);+ await this.store.issue.fetchPublicIssues(anchor, appliedFilters);} catch (error) {throw error;}};updateIssueFilters = async <K extends keyof TIssueFilters>(- projectId: string,+ anchor: string,filterKind: K,filterKey: keyof TIssueFilters[K],filterValue: TIssueFilters[K][typeof filterKey]) => {try {- if (!projectId || !filterKind || !filterKey || !filterValue) return;+ if (!filterKind || !filterKey || !filterValue) return;if (this.filters === undefined) runInAction(() => (this.filters = {}));runInAction(() => {- if (this.filters) set(this.filters, [projectId, filterKind, filterKey], filterValue);+ if (this.filters) set(this.filters, [anchor, filterKind, filterKey], filterValue);});- const workspaceSlug = this.store.project.workspace?.slug;- const currentAppliedFilters = this.appliedFilters;+ const appliedFilters = this.getAppliedFilters(anchor);- if (!workspaceSlug) return;- await this.store.issue.fetchPublicIssues(workspaceSlug, projectId, currentAppliedFilters);+ await this.store.issue.fetchPublicIssues(anchor, appliedFilters);} catch (error) {throw error;}diff --git a/space/store/issue.store.ts b/space/store/issue.store.tsindex 7967aafb1c..4f2d845b50 100644--- a/space/store/issue.store.ts+++ b/space/store/issue.store.ts@@ -1,87 +1,87 @@import { observable, action, makeObservable, runInAction } from "mobx";+import { computedFn } from "mobx-utils";+// types+import { IStateLite } from "@plane/types";// servicesimport IssueService from "@/services/issue.service";// types-import { IIssue, IIssueState, IIssueLabel } from "@/types/issue";+import { IIssue, IIssueLabel } from "@/types/issue";// storeimport { RootStore } from "./root.store";-// import { IssueDetailType, TIssueBoardKeys } from "types/issue";export interface IIssueStore {loader: boolean;error: any;- // issue options- issues: IIssue[] | null;- states: IIssueState[] | null;- labels: IIssueLabel[] | null;- // filtering+ // observables+ issues: IIssue[];+ states: IStateLite[];+ labels: IIssueLabel[];+ // filter observablesfilteredStates: string[];filteredLabels: string[];filteredPriorities: string[];- // service- issueService: any;// actions- fetchPublicIssues: (workspace_slug: string, project_slug: string, params: any) => Promise<void>;- getCountOfIssuesByState: (state: string) => number;- getFilteredIssuesByState: (state: string) => IIssue[];+ fetchPublicIssues: (anchor: string, params: any) => Promise<void>;+ // helpers+ getCountOfIssuesByState: (stateID: string) => number;+ getFilteredIssuesByState: (stateID: string) => IIssue[];}export class IssueStore implements IIssueStore {loader: boolean = false;error: any | null = null;-- states: IIssueState[] | null = [];- labels: IIssueLabel[] | null = [];-+ // observables+ states: IStateLite[] = [];+ labels: IIssueLabel[] = [];+ issues: IIssue[] = [];+ // filter observablesfilteredStates: string[] = [];filteredLabels: string[] = [];filteredPriorities: string[] = [];-- issues: IIssue[] | null = [];- issue_detail: any = {};-+ // root storerootStore: RootStore;- issueService: any;+ // services+ issueService: IssueService;- constructor(_rootStore: any) {+ constructor(_rootStore: RootStore) {makeObservable(this, {- // observable- loader: observable,+ loader: observable.ref,error: observable,- // issue options- states: observable.ref,- labels: observable.ref,- // filtering- filteredStates: observable.ref,- filteredLabels: observable.ref,- filteredPriorities: observable.ref,- // issues- issues: observable.ref,- issue_detail: observable.ref,+ // observables+ states: observable,+ labels: observable,+ issues: observable,+ // filter observables+ filteredStates: observable,+ filteredLabels: observable,+ filteredPriorities: observable,// actionsfetchPublicIssues: action,- getFilteredIssuesByState: action,});this.rootStore = _rootStore;this.issueService = new IssueService();}- fetchPublicIssues = async (workspaceSlug: string, projectId: string, params: any) => {+ /**+ * @description fetch issues, states and labels+ * @param {string} anchor+ * @param params+ */+ fetchPublicIssues = async (anchor: string, params: any) => {try {- this.loader = true;- this.error = null;+ runInAction(() => {+ this.loader = true;+ this.error = null;+ });- const response = await this.issueService.getPublicIssues(workspaceSlug, projectId, params);+ const response = await this.issueService.fetchPublicIssues(anchor, params);if (response) {- const states: IIssueState[] = [...response?.states];- const labels: IIssueLabel[] = [...response?.labels];- const issues: IIssue[] = [...response?.issues];runInAction(() => {- this.states = states;- this.labels = labels;- this.issues = issues;+ this.states = response.states;+ this.labels = response.labels;+ this.issues = response.issues;this.loader = false;});}@@ -91,11 +91,21 @@ export class IssueStore implements IIssueStore {}};- // computed- getCountOfIssuesByState(state_id: string): number {- return this.issues?.filter((issue) => issue.state == state_id).length || 0;- }+ /**+ * @description get total count of issues under a particular state+ * @param {string} stateID+ * @returns {number}+ */+ getCountOfIssuesByState = computedFn(+ (stateID: string) => this.issues?.filter((issue) => issue.state == stateID).length || 0+ );- getFilteredIssuesByState = (state_id: string): IIssue[] | [] =>- this.issues?.filter((issue) => issue.state == state_id) || [];+ /**+ * @description get array of issues under a particular state+ * @param {string} stateID+ * @returns {IIssue[]}+ */+ getFilteredIssuesByState = computedFn(+ (stateID: string) => this.issues?.filter((issue) => issue.state == stateID) || []+ );}diff --git a/space/store/project.store.ts b/space/store/project.store.tsdeleted file mode 100644index 02f2503235..0000000000--- a/space/store/project.store.ts+++ /dev/null@@ -1,96 +0,0 @@-// mobx-import { observable, action, makeObservable, runInAction, computed } from "mobx";-// service-import ProjectService from "@/services/project.service";-// store types-import { RootStore } from "@/store/root.store";-// types-import { TWorkspaceDetails, TProjectDetails, TProjectSettings } from "@/types/project";--export interface IProjectStore {- // observables- loader: boolean;- error: any | undefined;- settings: TProjectSettings | undefined;- workspace: TWorkspaceDetails | undefined;- project: TProjectDetails | undefined;- canReact: boolean;- canComment: boolean;- canVote: boolean;- // actions- fetchProjectSettings: (workspace_slug: string, project_slug: string) => Promise<void>;- hydrate: (projectSettings: any) => void;-}--export class ProjectStore implements IProjectStore {- // observables- loader: boolean = false;- error: any | undefined = undefined;- settings: TProjectSettings | undefined = undefined;- workspace: TWorkspaceDetails | undefined = undefined;- project: TProjectDetails | undefined = undefined;- // service- projectService;-- constructor(private store: RootStore) {- makeObservable(this, {- // loaders and error observables- loader: observable,- error: observable.ref,- // observable- workspace: observable,- project: observable,- settings: observable,- // computed- canReact: computed,- canComment: computed,- canVote: computed,- // actions- fetchProjectSettings: action,- hydrate: action,- });- // services- this.projectService = new ProjectService();- }-- // computed- get canReact() {- return this.settings?.reactions ?? false;- }- get canComment() {- return this.settings?.comments ?? false;- }- get canVote() {- return this.settings?.votes ?? false;- }-- fetchProjectSettings = async (workspace_slug: string, project_slug: string) => {- try {- this.loader = true;- this.error = null;-- const response = await this.projectService.getProjectSettings(workspace_slug, project_slug);-- if (response) {- this.store.issueFilter.updateLayoutOptions(response?.views);- runInAction(() => {- this.project = response?.project_details;- this.workspace = response?.workspace_detail;- this.settings = response;- this.loader = false;- });- }- return response;- } catch (error) {- this.loader = false;- this.error = error;- return error;- }- };-- hydrate = (projectSettings: TProjectSettings) => {- const { workspace_detail, project_details } = projectSettings;- this.workspace = workspace_detail;- this.project = project_details;- };-}diff --git a/space/store/publish/publish.store.ts b/space/store/publish/publish.store.tsnew file mode 100644index 0000000000..29cbc53ab5--- /dev/null+++ b/space/store/publish/publish.store.ts@@ -0,0 +1,111 @@+import { observable, makeObservable, computed } from "mobx";+// types+import { IWorkspaceLite, TProjectDetails, TPublishEntityType, TPublishSettings, TPublishViewProps } from "@plane/types";+// store types+import { RootStore } from "@/store/root.store";++export interface IPublishStore extends TPublishSettings {+ // computed+ workspaceSlug: string | undefined;+ canComment: boolean;+ canReact: boolean;+ canVote: boolean;+}++export class PublishStore implements IPublishStore {+ // observables+ anchor: string | undefined;+ is_comments_enabled: boolean;+ created_at: string | undefined;+ created_by: string | undefined;+ entity_identifier: string | undefined;+ entity_name: TPublishEntityType | undefined;+ id: string | undefined;+ inbox: unknown;+ project: string | undefined;+ project_details: TProjectDetails | undefined;+ is_reactions_enabled: boolean;+ updated_at: string | undefined;+ updated_by: string | undefined;+ view_props: TPublishViewProps | undefined;+ is_votes_enabled: boolean;+ workspace: string | undefined;+ workspace_detail: IWorkspaceLite | undefined;++ constructor(+ private store: RootStore,+ publishSettings: TPublishSettings+ ) {+ this.anchor = publishSettings.anchor;+ this.is_comments_enabled = publishSettings.is_comments_enabled;+ this.created_at = publishSettings.created_at;+ this.created_by = publishSettings.created_by;+ this.entity_identifier = publishSettings.entity_identifier;+ this.entity_name = publishSettings.entity_name;+ this.id = publishSettings.id;+ this.inbox = publishSettings.inbox;+ this.project = publishSettings.project;+ this.project_details = publishSettings.project_details;+ this.is_reactions_enabled = publishSettings.is_reactions_enabled;+ this.updated_at = publishSettings.updated_at;+ this.updated_by = publishSettings.updated_by;+ this.view_props = publishSettings.view_props;+ this.is_votes_enabled = publishSettings.is_votes_enabled;+ this.workspace = publishSettings.workspace;+ this.workspace_detail = publishSettings.workspace_detail;++ makeObservable(this, {+ // observables+ anchor: observable.ref,+ is_comments_enabled: observable.ref,+ created_at: observable.ref,+ created_by: observable.ref,+ entity_identifier: observable.ref,+ entity_name: observable.ref,+ id: observable.ref,+ inbox: observable,+ project: observable.ref,+ project_details: observable,+ is_reactions_enabled: observable.ref,+ updated_at: observable.ref,+ updated_by: observable.ref,+ view_props: observable,+ is_votes_enabled: observable.ref,+ workspace: observable.ref,+ workspace_detail: observable,+ // computed+ workspaceSlug: computed,+ canComment: computed,+ canReact: computed,+ canVote: computed,+ });+ }++ /**+ * @description returns the workspace slug from the workspace details+ */+ get workspaceSlug() {+ return this?.workspace_detail?.slug ?? undefined;+ }++ /**+ * @description returns whether commenting is enabled or not+ */+ get canComment() {+ return !!this.is_comments_enabled;+ }++ /**+ * @description returns whether reacting is enabled or not+ */+ get canReact() {+ return !!this.is_reactions_enabled;+ }++ /**+ * @description returns whether voting is enabled or not+ */+ get canVote() {+ return !!this.is_votes_enabled;+ }+}diff --git a/space/store/publish/publish_list.store.ts b/space/store/publish/publish_list.store.tsnew file mode 100644index 0000000000..b6722115d1--- /dev/null+++ b/space/store/publish/publish_list.store.ts@@ -0,0 +1,55 @@+import set from "lodash/set";+import { makeObservable, observable, runInAction, action } from "mobx";+// types+import { TPublishSettings } from "@plane/types";+// services+import PublishService from "@/services/publish.service";+// store+import { PublishStore } from "@/store/publish/publish.store";+// store+import { RootStore } from "../root.store";++export interface IPublishListStore {+ // observables+ publishMap: Record<string, PublishStore>; // anchor => PublishStore+ // actions+ fetchPublishSettings: (pageId: string) => Promise<TPublishSettings>;+}++export class PublishListStore implements IPublishListStore {+ // observables+ publishMap: Record<string, PublishStore> = {}; // anchor => PublishStore+ // service+ publishService;++ constructor(private store: RootStore) {+ makeObservable(this, {+ // observables+ publishMap: observable,+ // actions+ fetchPublishSettings: action,+ });+ // services+ this.publishService = new PublishService();+ }++ /**+ * @description fetch publish settings+ * @param {string} anchor+ */+ fetchPublishSettings = async (anchor: string) => {+ try {+ const response = await this.publishService.fetchPublishSettings(anchor);+ runInAction(() => {+ if (response.anchor && response.view_props) {+ this.store.issueFilter.updateLayoutOptions(response?.view_props);+ set(this.publishMap, [response.anchor], new PublishStore(this.store, response));+ }+ });++ return response;+ } catch (error) {+ throw error;+ }+ };+}diff --git a/space/store/root.store.ts b/space/store/root.store.tsindex 4a31840db3..082220f5d6 100644--- a/space/store/root.store.ts+++ b/space/store/root.store.ts@@ -3,30 +3,30 @@ import { enableStaticRendering } from "mobx-react-lite";import { IInstanceStore, InstanceStore } from "@/store/instance.store";import { IssueDetailStore, IIssueDetailStore } from "@/store/issue-detail.store";import { IssueStore, IIssueStore } from "@/store/issue.store";-import { IProjectStore, ProjectStore } from "@/store/project.store";import { IUserStore, UserStore } from "@/store/user.store";import { IssueFilterStore, IIssueFilterStore } from "./issue-filters.store";import { IMentionsStore, MentionsStore } from "./mentions.store";+import { IPublishListStore, PublishListStore } from "./publish/publish_list.store";enableStaticRendering(typeof window === "undefined");export class RootStore {instance: IInstanceStore;user: IUserStore;- project: IProjectStore;issue: IIssueStore;issueDetail: IIssueDetailStore;mentionStore: IMentionsStore;issueFilter: IIssueFilterStore;+ publishList: IPublishListStore;constructor() {this.instance = new InstanceStore(this);this.user = new UserStore(this);- this.project = new ProjectStore(this);this.issue = new IssueStore(this);this.issueDetail = new IssueDetailStore(this);this.mentionStore = new MentionsStore(this);this.issueFilter = new IssueFilterStore(this);+ this.publishList = new PublishListStore(this);}// eslint-disable-next-line @typescript-eslint/no-explicit-any@@ -40,10 +40,10 @@ export class RootStore {localStorage.setItem("theme", "system");this.instance = new InstanceStore(this);this.user = new UserStore(this);- this.project = new ProjectStore(this);this.issue = new IssueStore(this);this.issueDetail = new IssueDetailStore(this);this.mentionStore = new MentionsStore(this);this.issueFilter = new IssueFilterStore(this);+ this.publishList = new PublishListStore(this);};}diff --git a/space/styles/globals.css b/space/styles/globals.cssindex 47804b7686..0b41d84811 100644--- a/space/styles/globals.css+++ b/space/styles/globals.css@@ -302,6 +302,23 @@}}+* {+ margin: 0;+ padding: 0;+ box-sizing: border-box;+ -webkit-text-size-adjust: 100%;+ -ms-text-size-adjust: 100%;+ font-variant-ligatures: none;+ -webkit-font-variant-ligatures: none;+ text-rendering: optimizeLegibility;+ -moz-osx-font-smoothing: grayscale;+ -webkit-font-smoothing: antialiased;+}++body {+ color: rgba(var(--color-text-100));+}+::-webkit-scrollbar {width: 5px;height: 5px;diff --git a/space/types/app.d.ts b/space/types/app.d.tsdeleted file mode 100644index bd4af3b0c7..0000000000--- a/space/types/app.d.ts+++ /dev/null@@ -1,14 +0,0 @@-export interface IAppConfig {- email_password_login: boolean;- file_size_limit: number;- google_client_id: string | null;- github_app_name: string | null;- github_client_id: string | null;- magic_login: boolean;- slack_client_id: string | null;- posthog_api_key: string | null;- posthog_host: string | null;- has_openai_configured: boolean;- has_unsplash_configured: boolean;- is_self_managed: boolean;-}diff --git a/space/types/issue.d.ts b/space/types/issue.d.tsindex f2625fb764..5b729d1c09 100644--- a/space/types/issue.d.ts+++ b/space/types/issue.d.ts@@ -1,27 +1,17 @@+import { IStateLite, IWorkspaceLite, TIssuePriorities, TStateGroups } from "@plane/types";+export type TIssueLayout = "list" | "kanban" | "calendar" | "spreadsheet" | "gantt";export type TIssueLayoutOptions = {[key in TIssueLayout]: boolean;};-export type TIssueLayoutViews = {- [key in TIssueLayout]: { title: string; icon: string; className: string };-};-export type TIssueFilterPriority = "urgent" | "high" | "medium" | "low" | "none";export type TIssueFilterPriorityObject = {- key: TIssueFilterPriority;+ key: TIssuePriorities;title: string;className: string;icon: string;};-export type TIssueFilterState = "backlog" | "unstarted" | "started" | "completed" | "cancelled";-export type TIssueFilterStateObject = {- key: TIssueFilterState;- title: string;- color: string;- className: string;-};-export type TIssueFilterKeys = "priority" | "state" | "labels";export type TDisplayFilters = {@@ -29,8 +19,8 @@ export type TDisplayFilters = {};export type TFilters = {- state: TIssueFilterState[];- priority: TIssueFilterPriority[];+ state: TStateGroups[];+ priority: TIssuePriorities[];labels: string[];};@@ -43,6 +33,12 @@ export type TIssueQueryFilters = Partial<TFilters>;export type TIssueQueryFiltersParams = Partial<Record<keyof TFilters, string>>;+export type TIssuesResponse = {+ states: IStateLite[];+ labels: IIssueLabel[];+ issues: IIssue[];+};+export interface IIssue {id: string;comments: Comment[];@@ -68,17 +64,11 @@ export interface IIssue {export type IPeekMode = "side" | "modal" | "full";-export interface IIssueState {- id: string;- name: string;- group: TIssueGroupKey;- color: string;-}-export interface IIssueLabel {id: string;name: string;color: string;+ parent: string | null;}export interface IVote {@@ -114,7 +104,7 @@ export interface Comment {updated_at: Date;updated_by: string;workspace: string;- workspace_detail: WorkspaceDetail;+ workspace_detail: IWorkspaceLite;}export interface IIssueReaction {@@ -175,52 +165,8 @@ export interface ProjectDetail {description: string;}-export interface WorkspaceDetail {- name: string;- slug: string;- id: string;-}--export interface IssueDetailType {- [issueId: string]: {- issue: IIssue;- comments: Comment[];- reactions: any[];- votes: any[];- };-}--export type TIssueGroupByOptions = "state" | "priority" | "labels" | null;--export type TIssueParams = "priority" | "state" | "labels";-export interface IIssueFilterOptions {state?: string[] | null;labels?: string[] | null;priority?: string[] | null;}--// issues-export interface IGroupedIssues {- [group_id: string]: string[];-}--export interface ISubGroupedIssues {- [sub_grouped_id: string]: {- [group_id: string]: string[];- };-}--export type TUnGroupedIssues = string[];--export interface IIssueResponse {- [issue_id: string]: IIssue;-}--export type TLoader = "init-loader" | "mutation" | undefined;--export interface ViewFlags {- enableQuickAdd: boolean;- enableIssueCreation: boolean;- enableInlineEditing: boolean;-}diff --git a/space/types/project.d.ts b/space/types/project.d.tsdeleted file mode 100644index 90c89ed80c..0000000000--- a/space/types/project.d.ts+++ /dev/null@@ -1,42 +0,0 @@-import { TLogoProps } from "@plane/types";--export type TWorkspaceDetails = {- name: string;- slug: string;- id: string;-};--export type TViewDetails = {- list: boolean;- gantt: boolean;- kanban: boolean;- calendar: boolean;- spreadsheet: boolean;-};--export type TProjectDetails = {- id: string;- identifier: string;- name: string;- cover_image: string | undefined;- logo_props: TLogoProps;- description: string;-};--export type TProjectSettings = {- id: string;- anchor: string;- comments: boolean;- reactions: boolean;- votes: boolean;- inbox: unknown;- workspace: string;- workspace_detail: TWorkspaceDetails;- project: string;- project_details: TProjectDetails;- views: TViewDetails;- created_by: string;- updated_by: string;- created_at: string;- updated_at: string;-};diff --git a/space/types/theme.d.ts b/space/types/theme.d.tsdeleted file mode 100644index ca306be51f..0000000000--- a/space/types/theme.d.ts+++ /dev/null@@ -1,4 +0,0 @@-export interface IThemeStore {- theme: string;- setTheme: (theme: "light" | "dark" | string) => void;-}diff --git a/space/types/user.d.ts b/space/types/user.d.tsdeleted file mode 100644index d588278763..0000000000--- a/space/types/user.d.ts+++ /dev/null@@ -1,30 +0,0 @@-export interface IUser {- avatar: string;- cover_image: string | null;- created_at: Date;- created_location: string;- date_joined: Date;- email: string;- display_name: string;- first_name: string;- id: string;- is_email_verified: boolean;- is_onboarded: boolean;- is_tour_completed: boolean;- last_location: string;- last_login: Date;- last_name: string;- mobile_number: string;- role: string;- is_password_autoset: boolean;- onboarding_step: {- workspace_join?: boolean;- profile_complete?: boolean;- workspace_create?: boolean;- workspace_invite?: boolean;- };- token: string;- updated_at: Date;- username: string;- user_timezone: string;-}diff --git a/web/components/analytics/custom-analytics/select/y-axis.tsx b/web/components/analytics/custom-analytics/select/y-axis.tsxindex a33feb9679..1baf010d2a 100644--- a/web/components/analytics/custom-analytics/select/y-axis.tsx+++ b/web/components/analytics/custom-analytics/select/y-axis.tsx@@ -1,26 +1,54 @@-// ui+import { observer } from "mobx-react";import { TYAxisValues } from "@plane/types";import { CustomSelect } from "@plane/ui";-// types-import { ANALYTICS_Y_AXIS_VALUES } from "@/constants/analytics";// constants+import { ANALYTICS_Y_AXIS_VALUES } from "@/constants/analytics";+import { EEstimateSystem } from "@/constants/estimates";+// hooks+import { useAppRouter, useProjectEstimates } from "@/hooks/store";type Props = {value: TYAxisValues;onChange: () => void;};-export const SelectYAxis: React.FC<Props> = ({ value, onChange }) => (- <CustomSelect- value={value}- label={<span>{ANALYTICS_Y_AXIS_VALUES.find((v) => v.value === value)?.label ?? "None"}</span>}- onChange={onChange}- maxHeight="lg"- >- {ANALYTICS_Y_AXIS_VALUES.map((item) => (- <CustomSelect.Option key={item.value} value={item.value}>- {item.label}- </CustomSelect.Option>- ))}- </CustomSelect>-);+export const SelectYAxis: React.FC<Props> = observer(({ value, onChange }) => {+ // hooks+ const { projectId } = useAppRouter();+ const { areEstimateEnabledByProjectId, currentActiveEstimateId, estimateById } = useProjectEstimates();++ const isEstimateEnabled = (analyticsOption: string) => {+ if (analyticsOption === "estimate") {+ if (+ projectId &&+ currentActiveEstimateId &&+ areEstimateEnabledByProjectId(projectId) &&+ estimateById(currentActiveEstimateId)?.type === EEstimateSystem.POINTS+ ) {+ return true;+ } else {+ return false;+ }+ }++ return true;+ };++ return (+ <CustomSelect+ value={value}+ label={<span>{ANALYTICS_Y_AXIS_VALUES.find((v) => v.value === value)?.label ?? "None"}</span>}+ onChange={onChange}+ maxHeight="lg"+ >+ {ANALYTICS_Y_AXIS_VALUES.map(+ (item) =>+ isEstimateEnabled(item.value) && (+ <CustomSelect.Option key={item.value} value={item.value}>+ {item.label}+ </CustomSelect.Option>+ )+ )}+ </CustomSelect>+ );+});diff --git a/web/components/core/activity.tsx b/web/components/core/activity.tsxindex 28d84ffe47..5def2d7a99 100644--- a/web/components/core/activity.tsx+++ b/web/components/core/activity.tsx@@ -24,7 +24,7 @@ import { Tooltip, BlockedIcon, BlockerIcon, RelatedIcon, LayersIcon, DiceIcon }// helpersimport { renderFormattedDate } from "@/helpers/date-time.helper";import { capitalizeFirstLetter } from "@/helpers/string.helper";-import { useEstimate, useLabel } from "@/hooks/store";+import { useLabel } from "@/hooks/store";import { usePlatformOS } from "@/hooks/use-platform-os";// types@@ -97,22 +97,6 @@ const LabelPill = observer(({ labelId, workspaceSlug }: { labelId: string; works);});-const EstimatePoint = observer((props: { point: string }) => {- const { point } = props;- const { areEstimatesEnabledForCurrentProject, getEstimatePointValue } = useEstimate();- const currentPoint = Number(point) + 1;-- const estimateValue = getEstimatePointValue(Number(point), null);-- return (- <span className="font-medium text-custom-text-100 whitespace-nowrap">- {areEstimatesEnabledForCurrentProject- ? estimateValue- : `${currentPoint} ${currentPoint > 1 ? "points" : "point"}`}- </span>- );-});-const inboxActivityMessage = {declined: {showIssue: "declined issue",@@ -267,7 +251,7 @@ const activityDetails: {elsereturn (<>- set the estimate point to <EstimatePoint point={activity.new_value} />+ set the estimate point to {activity.new_value}{showIssue && (<>{" "}diff --git a/web/components/core/modals/gpt-assistant-popover.tsx b/web/components/core/modals/gpt-assistant-popover.tsxindex 099b90254e..0c9c30b31a 100644--- a/web/components/core/modals/gpt-assistant-popover.tsx+++ b/web/components/core/modals/gpt-assistant-popover.tsx@@ -1,4 +1,4 @@-import React, { useEffect, useState, useRef, Fragment } from "react";+import React, { useEffect, useState, useRef, Fragment, Ref } from "react";import { Placement } from "@popperjs/core";import { useRouter } from "next/router";import { Controller, useForm } from "react-hook-form"; // services@@ -196,7 +196,7 @@ export const GptAssistantPopover: React.FC<Props> = (props) => {<Popover.Panelas="div"className={`fixed z-10 flex w-full min-w-[50rem] max-w-full flex-col space-y-4 overflow-hidden rounded-[10px] border border-custom-border-200 bg-custom-background-100 p-4 shadow ${className}`}- ref={setPopperElement}+ ref={setPopperElement as Ref<HTMLDivElement>}style={styles.popper}{...attributes.popper}>diff --git a/web/components/dropdowns/estimate.tsx b/web/components/dropdowns/estimate.tsxindex 58243cc220..99e8106dec 100644--- a/web/components/dropdowns/estimate.tsx+++ b/web/components/dropdowns/estimate.tsx@@ -1,5 +1,4 @@import { Fragment, ReactNode, useRef, useState } from "react";-import sortBy from "lodash/sortBy";import { observer } from "mobx-react";import { usePopper } from "react-popper";import { Check, ChevronDown, Search, Triangle } from "lucide-react";@@ -7,7 +6,12 @@ import { Combobox } from "@headlessui/react";// helpersimport { cn } from "@/helpers/common.helper";// hooks-import { useAppRouter, useEstimate } from "@/hooks/store";+import {+ useAppRouter,+ useEstimate,+ useProjectEstimates,+ // useEstimate+} from "@/hooks/store";import { useDropdown } from "@/hooks/use-dropdown";// componentsimport { DropdownButton } from "./buttons";@@ -19,15 +23,15 @@ type Props = TDropdownProps & {button?: ReactNode;dropdownArrow?: boolean;dropdownArrowClassName?: string;- onChange: (val: number | null) => void;+ onChange: (val: string | undefined) => void;onClose?: () => void;projectId: string;- value: number | null;+ value: string | undefined;};type DropdownOptions =| {- value: number | null;+ value: string | null;query: string;content: JSX.Element;}[]@@ -76,19 +80,29 @@ export const EstimateDropdown: React.FC<Props> = observer((props) => {});// store hooksconst { workspaceSlug } = useAppRouter();- const { fetchProjectEstimates, getProjectActiveEstimateDetails, getEstimatePointValue } = useEstimate();- const activeEstimate = getProjectActiveEstimateDetails(projectId);- const options: DropdownOptions = sortBy(activeEstimate?.points ?? [], "key")?.map((point) => ({- value: point.key,- query: `${point?.value}`,- content: (- <div className="flex items-center gap-2">- <Triangle className="h-3 w-3 flex-shrink-0" />- <span className="flex-grow truncate">{point.value}</span>- </div>- ),- }));+ const { currentActiveEstimateId, getProjectEstimates } = useProjectEstimates();+ const { estimatePointIds, estimatePointById } = useEstimate(+ currentActiveEstimateId ? currentActiveEstimateId : undefined+ );++ const options: DropdownOptions = (estimatePointIds ?? [])+ ?.map((estimatePoint) => {+ const currentEstimatePoint = estimatePointById(estimatePoint);+ if (currentEstimatePoint)+ return {+ value: currentEstimatePoint.id,+ query: `${currentEstimatePoint?.value}`,+ content: (+ <div className="flex items-center gap-2">+ <Triangle className="h-3 w-3 flex-shrink-0" />+ <span className="flex-grow truncate">{currentEstimatePoint.value}</span>+ </div>+ ),+ };+ else undefined;+ })+ .filter((estimatePointDropdownOption) => estimatePointDropdownOption != undefined) as DropdownOptions;options?.unshift({value: null,query: "No estimate",@@ -103,10 +117,10 @@ export const EstimateDropdown: React.FC<Props> = observer((props) => {const filteredOptions =query === "" ? options : options?.filter((o) => o.query.toLowerCase().includes(query.toLowerCase()));- const selectedEstimate = value !== null ? getEstimatePointValue(value, projectId) : null;+ const selectedEstimate = value && estimatePointById ? estimatePointById(value) : undefined;const onOpen = async () => {- if (!activeEstimate && workspaceSlug) await fetchProjectEstimates(workspaceSlug, projectId);+ if (!currentActiveEstimateId && workspaceSlug) await getProjectEstimates(workspaceSlug, projectId);};const { handleClose, handleKeyDown, handleOnClick, searchInputKeyDown } = useDropdown({@@ -120,7 +134,7 @@ export const EstimateDropdown: React.FC<Props> = observer((props) => {setQuery,});- const dropdownOnChange = (val: number | null) => {+ const dropdownOnChange = (val: string | undefined) => {onChange(val);handleClose();};@@ -164,13 +178,13 @@ export const EstimateDropdown: React.FC<Props> = observer((props) => {className={buttonClassName}isActive={isOpen}tooltipHeading="Estimate"- tooltipContent={selectedEstimate !== null ? selectedEstimate : placeholder}+ tooltipContent={selectedEstimate ? selectedEstimate?.value : placeholder}showTooltip={showTooltip}variant={buttonVariant}>{!hideIcon && <Triangle className="h-3 w-3 flex-shrink-0" />}{(selectedEstimate || placeholder) && BUTTON_VARIANTS_WITH_TEXT.includes(buttonVariant) && (- <span className="flex-grow truncate">{selectedEstimate !== null ? selectedEstimate : placeholder}</span>+ <span className="flex-grow truncate">{selectedEstimate ? selectedEstimate?.value : placeholder}</span>)}{dropdownArrow && (<ChevronDown className={cn("h-2.5 w-2.5 flex-shrink-0", dropdownArrowClassName)} aria-hidden="true" />@@ -204,20 +218,14 @@ export const EstimateDropdown: React.FC<Props> = observer((props) => {{filteredOptions ? (filteredOptions.length > 0 ? (filteredOptions.map((option) => (- <Combobox.Option- key={option.value}- value={option.value}- className={({ active, selected }) =>- `flex w-full cursor-pointer select-none items-center justify-between gap-2 truncate rounded px-1 py-1.5 ${- active ? "bg-custom-background-80" : ""- } ${selected ? "text-custom-text-100" : "text-custom-text-200"}`- }- >- {({ selected }) => (- <>+ <Combobox.Option key={option.value} value={option.value}>+ {({ active, selected }) => (+ <div+ className={`flex w-full cursor-pointer select-none items-center justify-between gap-2 truncate rounded px-1 py-1.5 ${active ? `!hover:bg-custom-background-80` : ``} ${selected ? "text-custom-text-100" : "text-custom-text-200"}`}+ ><span className="flex-grow truncate">{option.content}</span>{selected && <Check className="h-3.5 w-3.5 flex-shrink-0" />}- </>+ </div>)}</Combobox.Option>))diff --git a/web/components/empty-state/comic-box-button.tsx b/web/components/empty-state/comic-box-button.tsxindex 0bf546a2f0..52cbb46cb1 100644--- a/web/components/empty-state/comic-box-button.tsx+++ b/web/components/empty-state/comic-box-button.tsx@@ -1,4 +1,4 @@-import { useState } from "react";+import { Ref, useState } from "react";import { usePopper } from "react-popper";import { Popover } from "@headlessui/react";// popper@@ -60,7 +60,7 @@ export const ComicBoxButton: React.FC<Props> = (props) => {<Popover.Panelas="div"className="flex flex-col rounded border border-custom-border-200 bg-custom-background-100 p-5 relative min-w-80"- ref={setPopperElement}+ ref={setPopperElement as Ref<HTMLDivElement>}style={styles.popper}{...attributes.popper}staticdiff --git a/web/components/estimates/create-update-estimate-modal.tsx b/web/components/estimates/create-update-estimate-modal.tsxdeleted file mode 100644index c8b44cc322..0000000000--- a/web/components/estimates/create-update-estimate-modal.tsx+++ /dev/null@@ -1,292 +0,0 @@-import React, { useEffect } from "react";-import { observer } from "mobx-react";-import { useRouter } from "next/router";-import { Controller, useForm } from "react-hook-form";-// types-import { IEstimate, IEstimateFormData } from "@plane/types";-// ui-import { Button, Input, TextArea, TOAST_TYPE, setToast } from "@plane/ui";-// components-import { EModalPosition, EModalWidth, ModalCore } from "@/components/core";-// helpers-import { checkDuplicates } from "@/helpers/array.helper";-// hooks-import { useEstimate } from "@/hooks/store";--type Props = {- isOpen: boolean;- handleClose: () => void;- data?: IEstimate;-};--const defaultValues = {- name: "",- description: "",- value1: "",- value2: "",- value3: "",- value4: "",- value5: "",- value6: "",-};--type FormValues = typeof defaultValues;--export const CreateUpdateEstimateModal: React.FC<Props> = observer((props) => {- const { handleClose, data, isOpen } = props;- // router- const router = useRouter();- const { workspaceSlug, projectId } = router.query;- // store hooks- const { createEstimate, updateEstimate } = useEstimate();- // form info- const {- formState: { errors, isSubmitting },- handleSubmit,- control,- reset,- } = useForm<FormValues>({- defaultValues,- });-- const onClose = () => {- handleClose();- reset();- };-- const handleCreateEstimate = async (payload: IEstimateFormData) => {- if (!workspaceSlug || !projectId) return;-- await createEstimate(workspaceSlug.toString(), projectId.toString(), payload)- .then(() => {- onClose();- })- .catch((err) => {- const error = err?.error;- const errorString = Array.isArray(error) ? error[0] : error;-- setToast({- type: TOAST_TYPE.ERROR,- title: "Error!",- message:- errorString ?? err.status === 400- ? "Estimate with that name already exists. Please try again with another name."- : "Estimate could not be created. Please try again.",- });- });- };-- const handleUpdateEstimate = async (payload: IEstimateFormData) => {- if (!workspaceSlug || !projectId || !data) return;-- await updateEstimate(workspaceSlug.toString(), projectId.toString(), data.id, payload)- .then(() => {- onClose();- })- .catch((err) => {- const error = err?.error;- const errorString = Array.isArray(error) ? error[0] : error;-- setToast({- type: TOAST_TYPE.ERROR,- title: "Error!",- message: errorString ?? "Estimate could not be updated. Please try again.",- });- });- };-- const onSubmit = async (formData: FormValues) => {- if (!formData.name || formData.name === "") {- setToast({- type: TOAST_TYPE.ERROR,- title: "Error!",- message: "Estimate title cannot be empty.",- });- return;- }-- if (- formData.value1 === "" ||- formData.value2 === "" ||- formData.value3 === "" ||- formData.value4 === "" ||- formData.value5 === "" ||- formData.value6 === ""- ) {- setToast({- type: TOAST_TYPE.ERROR,- title: "Error!",- message: "Estimate point cannot be empty.",- });- return;- }-- if (- formData.value1.length > 20 ||- formData.value2.length > 20 ||- formData.value3.length > 20 ||- formData.value4.length > 20 ||- formData.value5.length > 20 ||- formData.value6.length > 20- ) {- setToast({- type: TOAST_TYPE.ERROR,- title: "Error!",- message: "Estimate point cannot have more than 20 characters.",- });- return;- }-- if (- checkDuplicates([- formData.value1,- formData.value2,- formData.value3,- formData.value4,- formData.value5,- formData.value6,- ])- ) {- setToast({- type: TOAST_TYPE.ERROR,- title: "Error!",- message: "Estimate points cannot have duplicate values.",- });- return;- }-- const payload: IEstimateFormData = {- estimate: {- name: formData.name,- description: formData.description,- },- estimate_points: [],- };-- for (let i = 0; i < 6; i++) {- const point = {- key: i,- value: formData[`value${i + 1}` as keyof FormValues],- };-- if (data)- payload.estimate_points.push({- id: data.points[i].id,- ...point,- });- else payload.estimate_points.push({ ...point });- }-- if (data) await handleUpdateEstimate(payload);- else await handleCreateEstimate(payload);- };-- useEffect(() => {- if (data)- reset({- ...defaultValues,- ...data,- value1: data.points[0]?.value,- value2: data.points[1]?.value,- value3: data.points[2]?.value,- value4: data.points[3]?.value,- value5: data.points[4]?.value,- value6: data.points[5]?.value,- });- else reset({ ...defaultValues });- }, [data, reset]);-- return (- <ModalCore isOpen={isOpen} handleClose={handleClose} position={EModalPosition.TOP} width={EModalWidth.XXL}>- <form onSubmit={handleSubmit(onSubmit)}>- <div className="space-y-5 p-5">- <div className="text-xl font-medium text-custom-text-200">{data ? "Update" : "Create"} Estimate</div>- <div className="space-y-3">- <div>- <Controller- control={control}- name="name"- render={({ field: { value, onChange, ref } }) => (- <Input- id="name"- name="name"- type="name"- value={value}- onChange={onChange}- ref={ref}- hasError={Boolean(errors.name)}- placeholder="Title"- className="w-full text-base"- />- )}- />- </div>- <div>- <Controller- name="description"- control={control}- render={({ field: { value, onChange } }) => (- <TextArea- id="description"- name="description"- value={value}- placeholder="Description"- onChange={onChange}- className="w-full text-base resize-none min-h-24"- hasError={Boolean(errors?.description)}- />- )}- />- </div>- </div>- {/* list of all the points */}- {/* since they are all the same, we can use a loop to render them */}- <div className="grid grid-cols-3 gap-3">- {Array(6)- .fill(0)- .map((_, i) => (- <div className="flex items-center" key={i}>- <span className="flex h-full items-center rounded-lg bg-custom-background-80">- <span className="rounded-lg px-2 text-sm text-custom-text-200">{i + 1}</span>- <span className="rounded-r-lg bg-custom-background-100">- <Controller- control={control}- name={`value${i + 1}` as keyof FormValues}- rules={{- maxLength: {- value: 20,- message: "Estimate point must at most be of 20 characters",- },- }}- render={({ field: { value, onChange, ref } }) => (- <Input- ref={ref}- type="text"- value={value}- onChange={onChange}- id={`value${i + 1}`}- name={`value${i + 1}`}- placeholder={`Point ${i + 1}`}- className="w-full rounded-l-none"- hasError={Boolean(errors[`value${i + 1}` as keyof FormValues])}- />- )}- />- </span>- </span>- </div>- ))}- </div>- </div>- <div className="px-5 py-4 flex items-center justify-end gap-2 border-t-[0.5px] border-custom-border-200">- <Button variant="neutral-primary" size="sm" onClick={handleClose}>- Cancel- </Button>- <Button variant="primary" size="sm" type="submit" loading={isSubmitting}>- {data ? (isSubmitting ? "Updating" : "Update Estimate") : isSubmitting ? "Creating" : "Create Estimate"}- </Button>- </div>- </form>- </ModalCore>- );-});diff --git a/web/components/estimates/create/index.ts b/web/components/estimates/create/index.tsnew file mode 100644index 0000000000..7de8cb9889--- /dev/null+++ b/web/components/estimates/create/index.ts@@ -0,0 +1,2 @@+export * from "./modal";+export * from "./stage-one";diff --git a/web/components/estimates/create/modal.tsx b/web/components/estimates/create/modal.tsxnew file mode 100644index 0000000000..73031e9315--- /dev/null+++ b/web/components/estimates/create/modal.tsx@@ -0,0 +1,134 @@+import { FC, useEffect, useMemo, useState } from "react";+import { observer } from "mobx-react";+import { ChevronLeft } from "lucide-react";+import { IEstimateFormData, TEstimateSystemKeys, TEstimatePointsObject } from "@plane/types";+import { Button, TOAST_TYPE, setToast } from "@plane/ui";+// components+import { EModalPosition, EModalWidth, ModalCore } from "@/components/core";+import { EstimateCreateStageOne, EstimatePointCreateRoot } from "@/components/estimates";+// constants+import { EEstimateSystem, ESTIMATE_SYSTEMS } from "@/constants/estimates";+// hooks+import { useProjectEstimates } from "@/hooks/store";++type TCreateEstimateModal = {+ workspaceSlug: string;+ projectId: string;+ isOpen: boolean;+ handleClose: () => void;+};++export const CreateEstimateModal: FC<TCreateEstimateModal> = observer((props) => {+ // props+ const { workspaceSlug, projectId, isOpen, handleClose } = props;+ // hooks+ const { createEstimate } = useProjectEstimates();+ // states+ const [estimateSystem, setEstimateSystem] = useState<TEstimateSystemKeys>(EEstimateSystem.POINTS);+ const [estimatePoints, setEstimatePoints] = useState<TEstimatePointsObject[] | undefined>(undefined);+ const [buttonLoader, setButtonLoader] = useState(false);++ const handleUpdatePoints = (newPoints: TEstimatePointsObject[] | undefined) => setEstimatePoints(newPoints);++ useEffect(() => {+ if (isOpen) {+ setEstimateSystem(EEstimateSystem.POINTS);+ setEstimatePoints(undefined);+ }+ }, [isOpen]);++ const handleCreateEstimate = async () => {+ try {+ if (!workspaceSlug || !projectId || !estimatePoints) return;+ setButtonLoader(true);+ const payload: IEstimateFormData = {+ estimate: {+ name: ESTIMATE_SYSTEMS[estimateSystem]?.name,+ type: estimateSystem,+ last_used: true,+ },+ estimate_points: estimatePoints,+ };+ await createEstimate(workspaceSlug, projectId, payload);++ setButtonLoader(false);+ setToast({+ type: TOAST_TYPE.SUCCESS,+ title: "Estimate created",+ message: "A new estimate has been added in your project.",+ });+ handleClose();+ } catch (error) {+ setButtonLoader(false);+ setToast({+ type: TOAST_TYPE.ERROR,+ title: "Estimate creation failed",+ message: "We were unable to create the new estimate, please try again.",+ });+ }+ };++ // derived values+ const renderEstimateStepsCount = useMemo(() => (estimatePoints ? "2" : "1"), [estimatePoints]);++ return (+ <ModalCore isOpen={isOpen} handleClose={handleClose} position={EModalPosition.TOP} width={EModalWidth.XXL}>+ <div className="relative space-y-6 py-5">+ {/* heading */}+ <div className="relative flex justify-between items-center gap-2 px-5">+ <div className="relative flex items-center gap-1">+ {estimatePoints && (+ <div+ onClick={() => {+ setEstimateSystem(EEstimateSystem.POINTS);+ handleUpdatePoints(undefined);+ }}+ className="flex-shrink-0 cursor-pointer w-5 h-5 flex justify-center items-center"+ >+ <ChevronLeft className="w-4 h-4" />+ </div>+ )}+ <div className="text-xl font-medium text-custom-text-100">New Estimate System</div>+ </div>+ <div className="text-xs text-gray-400">Step {renderEstimateStepsCount} of 2</div>+ </div>++ {/* estimate steps */}+ <div className="px-5">+ {!estimatePoints && (+ <EstimateCreateStageOne+ estimateSystem={estimateSystem}+ handleEstimateSystem={setEstimateSystem}+ handleEstimatePoints={(templateType: string) =>+ handleUpdatePoints(ESTIMATE_SYSTEMS[estimateSystem].templates[templateType].values)+ }+ />+ )}+ {estimatePoints && (+ <>+ <EstimatePointCreateRoot+ workspaceSlug={workspaceSlug}+ projectId={projectId}+ estimateId={undefined}+ estimateType={estimateSystem}+ estimatePoints={estimatePoints}+ setEstimatePoints={setEstimatePoints}+ />+ </>+ )}+ </div>++ <div className="relative flex justify-end items-center gap-3 px-5 pt-5 border-t border-custom-border-200">+ <Button variant="neutral-primary" size="sm" onClick={handleClose} disabled={buttonLoader}>+ Cancel+ </Button>+ {estimatePoints && (+ <Button variant="primary" size="sm" onClick={handleCreateEstimate} disabled={buttonLoader}>+ {buttonLoader ? `Creating` : `Create Estimate`}+ </Button>+ )}+ </div>+ </div>+ </ModalCore>+ );+});diff --git a/web/components/estimates/create/stage-one.tsx b/web/components/estimates/create/stage-one.tsxnew file mode 100644index 0000000000..c8b546c53e--- /dev/null+++ b/web/components/estimates/create/stage-one.tsx@@ -0,0 +1,101 @@+import { FC } from "react";+import { Crown, Info } from "lucide-react";+import { TEstimateSystemKeys } from "@plane/types";+import { Tooltip } from "@plane/ui";+// components+import { RadioInput } from "@/components/estimates";+// constants+import { ESTIMATE_SYSTEMS } from "@/constants/estimates";++type TEstimateCreateStageOne = {+ estimateSystem: TEstimateSystemKeys;+ handleEstimateSystem: (value: TEstimateSystemKeys) => void;+ handleEstimatePoints: (value: string) => void;+};++export const EstimateCreateStageOne: FC<TEstimateCreateStageOne> = (props) => {+ const { estimateSystem, handleEstimateSystem, handleEstimatePoints } = props;++ const currentEstimateSystem = ESTIMATE_SYSTEMS[estimateSystem] || undefined;++ if (!currentEstimateSystem) return <></>;+ return (+ <div className="space-y-6">+ <div className="sm:flex sm:items-center sm:space-x-10 sm:space-y-0 gap-2 mb-2">+ <RadioInput+ options={Object.keys(ESTIMATE_SYSTEMS).map((system) => {+ const currentSystem = system as TEstimateSystemKeys;+ return {+ label: !ESTIMATE_SYSTEMS[currentSystem]?.is_available ? (+ <div className="relative flex items-center gap-2 cursor-no-drop text-custom-text-300">+ {ESTIMATE_SYSTEMS[currentSystem]?.name}+ <Tooltip tooltipContent={"Coming soon"}>+ <Info size={12} />+ </Tooltip>+ </div>+ ) : ESTIMATE_SYSTEMS[currentSystem]?.is_ee ? (+ <div className="relative flex items-center gap-2 cursor-no-drop text-custom-text-300">+ {ESTIMATE_SYSTEMS[currentSystem]?.name}+ <Tooltip tooltipContent={"upgrade"}>+ <Crown size={12} className="text-amber-400" />+ </Tooltip>+ </div>+ ) : (+ <div>{ESTIMATE_SYSTEMS[currentSystem]?.name}</div>+ ),+ value: system,+ disabled: !ESTIMATE_SYSTEMS[currentSystem]?.is_available || ESTIMATE_SYSTEMS[currentSystem]?.is_ee,+ };+ })}+ name="estimate-radio-input"+ label="Choose an estimate system"+ labelClassName="text-sm font-medium text-custom-text-200 mb-1.5"+ wrapperClassName="relative flex flex-wrap gap-14"+ fieldClassName="relative flex items-center gap-1.5"+ buttonClassName="size-4"+ selected={estimateSystem}+ onChange={(value) => handleEstimateSystem(value as TEstimateSystemKeys)}+ />+ </div>++ {ESTIMATE_SYSTEMS[estimateSystem]?.is_available && !ESTIMATE_SYSTEMS[estimateSystem]?.is_ee && (+ <>+ <div className="space-y-1.5">+ <div className="text-sm font-medium text-custom-text-200">Start from scratch</div>+ <button+ className="border border-custom-border-200 rounded-md p-3 py-2.5 text-left space-y-1 w-full block hover:bg-custom-background-90"+ onClick={() => handleEstimatePoints("custom")}+ >+ <p className="text-base font-medium">Custom</p>+ <p className="text-xs text-custom-text-300">+ Add your own <span className="lowercase">{currentEstimateSystem.name}</span> from scratch+ </p>+ </button>+ </div>++ <div className="space-y-1.5">+ <div className="text-sm font-medium text-custom-text-200">Choose a template</div>+ <div className="grid grid-cols-1 lg:grid-cols-2 gap-3">+ {Object.keys(currentEstimateSystem.templates).map((name) =>+ currentEstimateSystem.templates[name]?.hide ? null : (+ <button+ key={name}+ className="border border-custom-border-200 rounded-md p-3 py-2.5 text-left space-y-1 hover:bg-custom-background-90"+ onClick={() => handleEstimatePoints(name)}+ >+ <p className="text-base font-medium">{currentEstimateSystem.templates[name]?.title}</p>+ <p className="text-xs text-custom-text-300">+ {currentEstimateSystem.templates[name]?.values?.map((template) => template?.value)?.join(", ")}+ </p>+ </button>+ )+ )}+ </div>+ </div>+ </>+ )}+ </div>+ );+};++//diff --git a/web/components/estimates/delete-estimate-modal.tsx b/web/components/estimates/delete-estimate-modal.tsxdeleted file mode 100644index d0949316f7..0000000000--- a/web/components/estimates/delete-estimate-modal.tsx+++ /dev/null@@ -1,79 +0,0 @@-import React, { useEffect, useState } from "react";-import { observer } from "mobx-react";-import { useRouter } from "next/router";-// types-import { IEstimate } from "@plane/types";-// ui-import { TOAST_TYPE, setToast } from "@plane/ui";-// components-import { AlertModalCore } from "@/components/core";-// hooks-import { useEstimate } from "@/hooks/store";--type Props = {- isOpen: boolean;- data: IEstimate | null;- handleClose: () => void;-};--export const DeleteEstimateModal: React.FC<Props> = observer((props) => {- const { isOpen, handleClose, data } = props;- // states- const [isDeleteLoading, setIsDeleteLoading] = useState(false);- // router- const router = useRouter();- const { workspaceSlug, projectId } = router.query;- // store hooks- const { deleteEstimate } = useEstimate();-- const handleEstimateDelete = async () => {- if (!workspaceSlug || !projectId) return;-- setIsDeleteLoading(true);-- // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain- const estimateId = data?.id!;-- await deleteEstimate(workspaceSlug.toString(), projectId.toString(), estimateId)- .then(() => {- handleClose();- })- .catch((err) => {- const error = err?.error;- const errorString = Array.isArray(error) ? error[0] : error;-- setToast({- type: TOAST_TYPE.ERROR,- title: "Error!",- message: errorString ?? "Estimate could not be deleted. Please try again",- });- })- .finally(() => setIsDeleteLoading(false));- };-- useEffect(() => {- setIsDeleteLoading(false);- }, [isOpen]);-- const onClose = () => {- setIsDeleteLoading(false);- handleClose();- };-- return (- <AlertModalCore- handleClose={onClose}- handleSubmit={handleEstimateDelete}- isSubmitting={isDeleteLoading}- isOpen={isOpen}- title="Delete Estimate"- content={- <>- Are you sure you want to delete estimate-{" "}- <span className="break-words font-medium text-custom-text-100">{data?.name}</span>- {""}? All of the data related to the estiamte will be permanently removed. This action cannot be undone.- </>- }- />- );-});diff --git a/web/components/estimates/delete/index.ts b/web/components/estimates/delete/index.tsnew file mode 100644index 0000000000..031608e25f--- /dev/null+++ b/web/components/estimates/delete/index.ts@@ -0,0 +1 @@+export * from "./modal";diff --git a/web/components/estimates/delete/modal.tsx b/web/components/estimates/delete/modal.tsxnew file mode 100644index 0000000000..dc72e83be5--- /dev/null+++ b/web/components/estimates/delete/modal.tsx@@ -0,0 +1,81 @@+import { FC, useState } from "react";+import { observer } from "mobx-react";+import { Button, TOAST_TYPE, setToast } from "@plane/ui";+// components+import { EModalPosition, EModalWidth, ModalCore } from "@/components/core";+// hooks+import { useEstimate, useProject, useProjectEstimates } from "@/hooks/store";++type TDeleteEstimateModal = {+ workspaceSlug: string;+ projectId: string;+ estimateId: string | undefined;+ isOpen: boolean;+ handleClose: () => void;+};++export const DeleteEstimateModal: FC<TDeleteEstimateModal> = observer((props) => {+ // props+ const { workspaceSlug, projectId, estimateId, isOpen, handleClose } = props;+ // hooks+ const { areEstimateEnabledByProjectId, deleteEstimate } = useProjectEstimates();+ const { asJson: estimate } = useEstimate(estimateId);+ const { updateProject } = useProject();+ // states+ const [buttonLoader, setButtonLoader] = useState(false);++ const handleDeleteEstimate = async () => {+ try {+ if (!workspaceSlug || !projectId || !estimateId) return;+ setButtonLoader(true);++ await deleteEstimate(workspaceSlug, projectId, estimateId);+ if (areEstimateEnabledByProjectId(projectId)) {+ await updateProject(workspaceSlug, projectId, { estimate: null });+ }+ setButtonLoader(false);+ setToast({+ type: TOAST_TYPE.SUCCESS,+ title: "Estimate deleted",+ message: "Estimate has been removed from your project.",+ });+ handleClose();+ } catch (error) {+ setButtonLoader(false);+ setToast({+ type: TOAST_TYPE.ERROR,+ title: "Estimate creation failed",+ message: "We were unable to delete the estimate, please try again.",+ });+ }+ };++ return (+ <ModalCore isOpen={isOpen} handleClose={handleClose} position={EModalPosition.TOP} width={EModalWidth.XXL}>+ <div className="relative space-y-6 py-5">+ {/* heading */}+ <div className="relative flex justify-between items-center gap-2 px-5">+ <div className="text-xl font-medium text-custom-text-100">Delete Estimate System</div>+ </div>++ {/* estimate steps */}+ <div className="px-5">+ <div className="text-base text-custom-text-200">+ Deleting the estimate <span className="font-bold text-custom-text-100">{estimate?.name}</span>+ system will remove it from all issues permanently. This action cannot be undone. If you add estimates+ again, you will need to update all the issues.+ </div>+ </div>++ <div className="relative flex justify-end items-center gap-3 px-5 pt-5 border-t border-custom-border-200">+ <Button variant="neutral-primary" size="sm" onClick={handleClose} disabled={buttonLoader}>+ Cancel+ </Button>+ <Button variant="danger" size="sm" onClick={handleDeleteEstimate} disabled={buttonLoader}>+ {buttonLoader ? "Deleting" : "Delete Estimate"}+ </Button>+ </div>+ </div>+ </ModalCore>+ );+});diff --git a/web/components/estimates/empty-screen.tsx b/web/components/estimates/empty-screen.tsxnew file mode 100644index 0000000000..be22098dc7--- /dev/null+++ b/web/components/estimates/empty-screen.tsx@@ -0,0 +1,42 @@+import { FC } from "react";+import Image from "next/image";+import { useTheme } from "next-themes";+import { Button } from "@plane/ui";+// public images+import EstimateEmptyDarkImage from "@/public/empty-state/estimates/dark.svg";+import EstimateEmptyLightImage from "@/public/empty-state/estimates/light.svg";++type TEstimateEmptyScreen = {+ onButtonClick: () => void;+};++export const EstimateEmptyScreen: FC<TEstimateEmptyScreen> = (props) => {+ // props+ const { onButtonClick } = props;+ const { resolvedTheme } = useTheme();++ const emptyScreenImage = resolvedTheme === "light" ? EstimateEmptyLightImage : EstimateEmptyDarkImage;++ return (+ <div className="relative flex flex-col justify-center items-center text-center gap-8 border border-custom-border-300 rounded bg-custom-background-90 py-10">+ <div className="flex-shrink-0 w-[120px] h-[120px] overflow-hidden relative flex justify-center items-center">+ <Image+ src={emptyScreenImage}+ alt="Empty estimate image"+ width={100}+ height={100}+ className="object-contain w-full h-full"+ />+ </div>+ <div className="space-y-1.5">+ <h3 className="text-xl font-semibold text-custom-text-100">No estimate systems yet</h3>+ <p className="text-sm text-custom-text-300">+ Create a set of estimates to communicate the amount of work per issue.+ </p>+ </div>+ <div>+ <Button onClick={onButtonClick}>Add Estimate System</Button>+ </div>+ </div>+ );+};diff --git a/web/components/estimates/estimate-disable-switch.tsx b/web/components/estimates/estimate-disable-switch.tsxnew file mode 100644index 0000000000..35b9b09cd8--- /dev/null+++ b/web/components/estimates/estimate-disable-switch.tsx@@ -0,0 +1,50 @@+import { FC } from "react";+import { observer } from "mobx-react";+import { TOAST_TYPE, ToggleSwitch, setToast } from "@plane/ui";+// hooks+import { useProject, useProjectEstimates } from "@/hooks/store";++type TEstimateDisableSwitch = {+ workspaceSlug: string;+ projectId: string;+ isAdmin: boolean;+};++export const EstimateDisableSwitch: FC<TEstimateDisableSwitch> = observer((props) => {+ const { workspaceSlug, projectId, isAdmin } = props;+ // hooks+ const { updateProject, currentProjectDetails } = useProject();+ const { currentActiveEstimateId } = useProjectEstimates();++ const currentProjectActiveEstimate = currentProjectDetails?.estimate || undefined;++ const disableEstimate = async () => {+ if (!workspaceSlug || !projectId) return;++ try {+ await updateProject(workspaceSlug, projectId, {+ estimate: currentProjectActiveEstimate ? null : currentActiveEstimateId,+ });+ setToast({+ type: TOAST_TYPE.SUCCESS,+ title: "Success!",+ message: currentProjectActiveEstimate ? "Estimates have been disabled" : "Estimates have been enabled",+ });+ } catch (err) {+ setToast({+ type: TOAST_TYPE.ERROR,+ title: "Error!",+ message: "Estimate could not be disabled. Please try again",+ });+ }+ };++ return (+ <ToggleSwitch+ value={Boolean(currentProjectActiveEstimate)}+ onChange={disableEstimate}+ disabled={!isAdmin}+ size="sm"+ />+ );+});diff --git a/web/components/estimates/estimate-list-item-buttons.tsx b/web/components/estimates/estimate-list-item-buttons.tsxnew file mode 100644index 0000000000..d2da059ee4--- /dev/null+++ b/web/components/estimates/estimate-list-item-buttons.tsx@@ -0,0 +1,34 @@+import { FC } from "react";+import { observer } from "mobx-react";+import { Pen, Trash } from "lucide-react";++type TEstimateListItem = {+ estimateId: string;+ isAdmin: boolean;+ isEstimateEnabled: boolean;+ isEditable: boolean;+ onEditClick?: (estimateId: string) => void;+ onDeleteClick?: (estimateId: string) => void;+};++export const EstimateListItemButtons: FC<TEstimateListItem> = observer((props) => {+ const { estimateId, isAdmin, isEditable, onEditClick, onDeleteClick } = props;+ if (!isAdmin || !isEditable) return <></>;++ return (+ <div className="relative flex items-center gap-1">+ <button+ className="relative flex-shrink-0 w-6 h-6 flex justify-center items-center rounded cursor-pointer transition-colors overflow-hidden hover:bg-custom-background-80"+ onClick={() => onEditClick && onEditClick(estimateId)}+ >+ <Pen size={12} />+ </button>+ <button+ className="relative flex-shrink-0 w-6 h-6 flex justify-center items-center rounded cursor-pointer transition-colors overflow-hidden hover:bg-custom-background-80"+ onClick={() => onDeleteClick && onDeleteClick(estimateId)}+ >+ <Trash size={12} />+ </button>+ </div>+ );+});diff --git a/web/components/estimates/estimate-list-item.tsx b/web/components/estimates/estimate-list-item.tsxindex 82046e6b0f..8a27722a2e 100644--- a/web/components/estimates/estimate-list-item.tsx+++ b/web/components/estimates/estimate-list-item.tsx@@ -1,114 +1,46 @@-import React from "react";+import { FC } from "react";import { observer } from "mobx-react";-import { useRouter } from "next/router";-// hooks-import { Pencil, Trash2 } from "lucide-react";-import { IEstimate } from "@plane/types";-import { Button, CustomMenu, TOAST_TYPE, setToast } from "@plane/ui";-import { orderArrayBy } from "@/helpers/array.helper";-import { useProject } from "@/hooks/store";-// ui-//icons// helpers-// types+import { cn } from "@/helpers/common.helper";+// hooks+import { useEstimate, useProjectEstimates } from "@/hooks/store";+import { EstimateListItemButtons } from "./estimate-list-item-buttons";-type Props = {- estimate: IEstimate;- editEstimate: (estimate: IEstimate) => void;- deleteEstimate: (estimateId: string) => void;+type TEstimateListItem = {+ estimateId: string;+ isAdmin: boolean;+ isEstimateEnabled: boolean;+ isEditable: boolean;+ onEditClick?: (estimateId: string) => void;+ onDeleteClick?: (estimateId: string) => void;};-export const EstimateListItem: React.FC<Props> = observer((props) => {- const { estimate, editEstimate, deleteEstimate } = props;- // router- const router = useRouter();- const { workspaceSlug, projectId } = router.query;- // store hooks- const { currentProjectDetails, updateProject } = useProject();-- const handleUseEstimate = async () => {- if (!workspaceSlug || !projectId) return;-- await updateProject(workspaceSlug.toString(), projectId.toString(), {- estimate: estimate.id,- }).catch((err) => {- const error = err?.error;- const errorString = Array.isArray(error) ? error[0] : error;+export const EstimateListItem: FC<TEstimateListItem> = observer((props) => {+ const { estimateId, isAdmin, isEstimateEnabled, isEditable } = props;+ // hooks+ const { estimateById } = useProjectEstimates();+ const { estimatePointIds, estimatePointById } = useEstimate(estimateId);+ const currentEstimate = estimateById(estimateId);- setToast({- type: TOAST_TYPE.ERROR,- title: "Error!",- message: errorString ?? "Estimate points could not be used. Please try again.",- });- });- };+ // derived values+ const estimatePointValues = estimatePointIds?.map((estimatePointId) => {+ const estimatePoint = estimatePointById(estimatePointId);+ if (estimatePoint) return estimatePoint.value;+ });+ if (!currentEstimate) return <></>;return (- <>- <div className="gap-2 border-b border-custom-border-100 p-4">- <div className="flex items-center justify-between">- <div>- <h6 className="flex w-[40vw] items-center gap-2 truncate text-sm font-medium">- {estimate.name}- {currentProjectDetails?.estimate && currentProjectDetails?.estimate === estimate.id && (- <span className="rounded bg-green-500/20 px-2 py-0.5 text-xs text-green-500">In use</span>- )}- </h6>- <p className="font-sm w-[40vw] truncate text-[14px] font-normal text-custom-text-200">- {estimate.description}- </p>- </div>- <div className="flex items-center gap-2">- {currentProjectDetails?.estimate !== estimate?.id && estimate?.points?.length > 0 && (- <Button variant="neutral-primary" onClick={handleUseEstimate} size="sm">- Use- </Button>- )}- <CustomMenu ellipsis>- <CustomMenu.MenuItem- onClick={() => {- editEstimate(estimate);- }}- >- <div className="flex items-center justify-start gap-2">- <Pencil className="h-3.5 w-3.5" />- <span>Edit estimate</span>- </div>- </CustomMenu.MenuItem>- {currentProjectDetails?.estimate !== estimate.id && (- <CustomMenu.MenuItem- onClick={() => {- deleteEstimate(estimate.id);- }}- >- <div className="flex items-center justify-start gap-2">- <Trash2 className="h-3.5 w-3.5" />- <span>Delete estimate</span>- </div>- </CustomMenu.MenuItem>- )}- </CustomMenu>- </div>- </div>- {estimate?.points?.length > 0 ? (- <div className="flex text-xs text-custom-text-200">- Estimate points (- <span className="flex gap-1">- {orderArrayBy(estimate.points, "key").map((point, index) => (- <h6 key={point.id} className="text-custom-text-200">- {point.value}- {index !== estimate.points.length - 1 && ","}{" "}- </h6>- ))}- </span>- )- </div>- ) : (- <div>- <p className="text-xs text-custom-text-200">No estimate points</p>- </div>- )}+ <div+ className={cn(+ "relative border-b border-custom-border-200 flex justify-between items-center gap-3 py-3.5",+ isAdmin && isEditable && isEstimateEnabled ? `text-custom-text-100` : `text-custom-text-200`+ )}+ >+ <div className="space-y-1">+ <h3 className="font-medium text-base">{currentEstimate?.name}</h3>+ <p className="text-xs">{(estimatePointValues || [])?.join(", ")}</p></div>- </>+ <EstimateListItemButtons {...props} />+ </div>);});diff --git a/web/components/estimates/estimate-list.tsx b/web/components/estimates/estimate-list.tsxnew file mode 100644index 0000000000..57de5bc8d8--- /dev/null+++ b/web/components/estimates/estimate-list.tsx@@ -0,0 +1,35 @@+import { FC } from "react";+import { observer } from "mobx-react";+// components+import { EstimateListItem } from "@/components/estimates";++type TEstimateList = {+ estimateIds: string[] | undefined;+ isAdmin: boolean;+ isEstimateEnabled?: boolean;+ isEditable?: boolean;+ onEditClick?: (estimateId: string) => void;+ onDeleteClick?: (estimateId: string) => void;+};++export const EstimateList: FC<TEstimateList> = observer((props) => {+ const { estimateIds, isAdmin, isEstimateEnabled = false, isEditable = false, onEditClick, onDeleteClick } = props;++ if (!estimateIds || estimateIds?.length <= 0) return <></>;+ return (+ <div>+ {estimateIds &&+ estimateIds.map((estimateId) => (+ <EstimateListItem+ key={estimateId}+ estimateId={estimateId}+ isAdmin={isAdmin}+ isEstimateEnabled={isEstimateEnabled}+ isEditable={isEditable}+ onEditClick={onEditClick}+ onDeleteClick={onDeleteClick}+ />+ ))}+ </div>+ );+});diff --git a/web/components/estimates/estimate-search.tsx b/web/components/estimates/estimate-search.tsxnew file mode 100644index 0000000000..7c94fc8b87--- /dev/null+++ b/web/components/estimates/estimate-search.tsx@@ -0,0 +1,9 @@+import { FC } from "react";+import { observer } from "mobx-react";++export const EstimateSearch: FC = observer(() => {+ // hooks+ const {} = {};++ return <div>Estimate Search</div>;+});diff --git a/web/components/estimates/estimates-list.tsx b/web/components/estimates/estimates-list.tsxdeleted file mode 100644index fc54cd6545..0000000000--- a/web/components/estimates/estimates-list.tsx+++ /dev/null@@ -1,121 +0,0 @@-import React, { useState } from "react";-import { observer } from "mobx-react";-import { useRouter } from "next/router";-import { IEstimate } from "@plane/types";-// store hooks-import { Button, Loader, TOAST_TYPE, setToast } from "@plane/ui";-import { EmptyState } from "@/components/empty-state";-import { CreateUpdateEstimateModal, DeleteEstimateModal, EstimateListItem } from "@/components/estimates";-import { EmptyStateType } from "@/constants/empty-state";-import { orderArrayBy } from "@/helpers/array.helper";-import { useEstimate, useProject } from "@/hooks/store";-// components-// ui-// types-// helpers-// constants--export const EstimatesList: React.FC = observer(() => {- // states- const [estimateFormOpen, setEstimateFormOpen] = useState(false);- const [estimateToDelete, setEstimateToDelete] = useState<string | null>(null);- const [estimateToUpdate, setEstimateToUpdate] = useState<IEstimate | undefined>();- // router- const router = useRouter();- const { workspaceSlug, projectId } = router.query;- // store hooks- const { updateProject, currentProjectDetails } = useProject();- const { projectEstimates, getProjectEstimateById } = useEstimate();-- const editEstimate = (estimate: IEstimate) => {- setEstimateFormOpen(true);- // Order the points array by key before updating the estimate to update state- setEstimateToUpdate({- ...estimate,- points: orderArrayBy(estimate.points, "key"),- });- };-- const disableEstimates = () => {- if (!workspaceSlug || !projectId) return;-- updateProject(workspaceSlug.toString(), projectId.toString(), { estimate: null }).catch((err) => {- const error = err?.error;- const errorString = Array.isArray(error) ? error[0] : error;-- setToast({- type: TOAST_TYPE.ERROR,- title: "Error!",- message: errorString ?? "Estimate could not be disabled. Please try again",- });- });- };-- return (- <>- <CreateUpdateEstimateModal- isOpen={estimateFormOpen}- data={estimateToUpdate}- handleClose={() => {- setEstimateFormOpen(false);- setEstimateToUpdate(undefined);- }}- />-- <DeleteEstimateModal- isOpen={!!estimateToDelete}- handleClose={() => setEstimateToDelete(null)}- data={getProjectEstimateById(estimateToDelete!)}- />-- <section className="flex items-center justify-between border-b border-custom-border-100 py-3.5">- <h3 className="text-xl font-medium">Estimates</h3>- <div className="col-span-12 space-y-5 sm:col-span-7">- <div className="flex items-center gap-2">- <Button- variant="primary"- onClick={() => {- setEstimateFormOpen(true);- setEstimateToUpdate(undefined);- }}- size="sm"- >- Add Estimate- </Button>- {currentProjectDetails?.estimate && (- <Button variant="neutral-primary" onClick={disableEstimates} size="sm">- Disable Estimates- </Button>- )}- </div>- </div>- </section>-- {projectEstimates ? (- projectEstimates.length > 0 ? (- <section className="h-full overflow-y-auto bg-custom-background-100">- {projectEstimates.map((estimate) => (- <EstimateListItem- key={estimate.id}- estimate={estimate}- editEstimate={(estimate) => editEstimate(estimate)}- deleteEstimate={(estimateId) => setEstimateToDelete(estimateId)}- />- ))}- </section>- ) : (- <div className="h-full w-full py-8">- <EmptyState type={EmptyStateType.PROJECT_SETTINGS_ESTIMATE} />- </div>- )- ) : (- <Loader className="mt-5 space-y-5">- <Loader.Item height="40px" />- <Loader.Item height="40px" />- <Loader.Item height="40px" />- <Loader.Item height="40px" />- </Loader>- )}- </>- );-});diff --git a/web/components/estimates/index.ts b/web/components/estimates/index.tsindex 2f47330555..e62c4cabbc 100644--- a/web/components/estimates/index.ts+++ b/web/components/estimates/index.ts@@ -1,4 +1,25 @@-export * from "./create-update-estimate-modal";-export * from "./delete-estimate-modal";+export * from "./root";++export * from "./empty-screen";+export * from "./loader-screen";+export * from "./radio-select";++export * from "./estimate-search";+export * from "./estimate-disable-switch";++// estimates+export * from "./estimate-list";export * from "./estimate-list-item";-export * from "./estimates-list";+export * from "./estimate-list-item-buttons";++// create+export * from "./create";++// update+export * from "./update";++// delete+export * from "./delete";++// estimate points+export * from "./points";diff --git a/web/components/estimates/loader-screen.tsx b/web/components/estimates/loader-screen.tsxnew file mode 100644index 0000000000..4942821510--- /dev/null+++ b/web/components/estimates/loader-screen.tsx@@ -0,0 +1,11 @@+import { FC } from "react";+import { Loader } from "@plane/ui";++export const EstimateLoaderScreen: FC = () => (+ <Loader className="mt-5 space-y-5">+ <Loader.Item height="40px" />+ <Loader.Item height="40px" />+ <Loader.Item height="40px" />+ <Loader.Item height="40px" />+ </Loader>+);diff --git a/web/components/estimates/points/create-root.tsx b/web/components/estimates/points/create-root.tsxnew file mode 100644index 0000000000..1f9315b4f1--- /dev/null+++ b/web/components/estimates/points/create-root.tsx@@ -0,0 +1,139 @@+import { Dispatch, FC, SetStateAction, useCallback, useState } from "react";+import { observer } from "mobx-react";+import { Plus } from "lucide-react";+import { TEstimatePointsObject, TEstimateSystemKeys } from "@plane/types";+import { Button, Sortable } from "@plane/ui";+// components+import { EstimatePointCreate, EstimatePointItemPreview } from "@/components/estimates/points";+// constants+import { maxEstimatesCount } from "@/constants/estimates";++type TEstimatePointCreateRoot = {+ workspaceSlug: string;+ projectId: string;+ estimateId: string | undefined;+ estimateType: TEstimateSystemKeys;+ estimatePoints: TEstimatePointsObject[];+ setEstimatePoints: Dispatch<SetStateAction<TEstimatePointsObject[] | undefined>>;+};++export const EstimatePointCreateRoot: FC<TEstimatePointCreateRoot> = observer((props) => {+ // props+ const { workspaceSlug, projectId, estimateId, estimateType, estimatePoints, setEstimatePoints } = props;+ // states+ const [estimatePointCreate, setEstimatePointCreate] = useState<TEstimatePointsObject[] | undefined>(undefined);++ const handleEstimatePoint = useCallback(+ (mode: "add" | "remove" | "update", value: TEstimatePointsObject) => {+ switch (mode) {+ case "add":+ setEstimatePoints((prevValue) => {+ prevValue = prevValue ? [...prevValue] : [];+ return [...prevValue, value];+ });+ break;+ case "update":+ setEstimatePoints((prevValue) => {+ prevValue = prevValue ? [...prevValue] : [];+ return prevValue.map((item) => (item.key === value.key ? { ...item, value: value.value } : item));+ });+ break;+ case "remove":+ setEstimatePoints((prevValue) => {+ prevValue = prevValue ? [...prevValue] : [];+ return prevValue.filter((item) => item.key !== value.key);+ });+ break;+ default:+ break;+ }+ },+ [setEstimatePoints]+ );++ const handleEstimatePointCreate = (mode: "add" | "remove", value: TEstimatePointsObject) => {+ switch (mode) {+ case "add":+ setEstimatePointCreate((prevValue) => {+ prevValue = prevValue ? [...prevValue] : [];+ return [...prevValue, value];+ });+ break;+ case "remove":+ setEstimatePointCreate((prevValue) => {+ prevValue = prevValue ? [...prevValue] : [];+ return prevValue.filter((item) => item.key !== value.key);+ });+ break;+ default:+ break;+ }+ };++ const handleDragEstimatePoints = (updatedEstimatedOrder: TEstimatePointsObject[]) => {+ const updatedEstimateKeysOrder = updatedEstimatedOrder.map((item, index) => ({ ...item, key: index + 1 }));+ setEstimatePoints(() => updatedEstimateKeysOrder);+ };++ if (!workspaceSlug || !projectId) return <></>;+ return (+ <div className="space-y-3">+ <div className="text-sm font-medium text-custom-text-200 capitalize">{estimateType}</div>++ <div>+ <Sortable+ data={estimatePoints}+ render={(value: TEstimatePointsObject) => (+ <EstimatePointItemPreview+ workspaceSlug={workspaceSlug}+ projectId={projectId}+ estimateId={estimateId}+ estimateType={estimateType}+ estimatePointId={value?.id}+ estimatePoints={estimatePoints}+ estimatePoint={value}+ handleEstimatePointValueUpdate={(estimatePointValue: string) =>+ handleEstimatePoint("update", { ...value, value: estimatePointValue })+ }+ handleEstimatePointValueRemove={() => handleEstimatePoint("remove", value)}+ />+ )}+ onChange={(data: TEstimatePointsObject[]) => handleDragEstimatePoints(data)}+ keyExtractor={(item: TEstimatePointsObject) => item?.id?.toString() || item.value.toString()}+ />+ </div>++ {estimatePointCreate &&+ estimatePointCreate.map((estimatePoint) => (+ <EstimatePointCreate+ key={estimatePoint?.key}+ workspaceSlug={workspaceSlug}+ projectId={projectId}+ estimateId={estimateId}+ estimateType={estimateType}+ estimatePoints={estimatePoints}+ handleEstimatePointValue={(estimatePointValue: string) =>+ handleEstimatePoint("add", { ...estimatePoint, value: estimatePointValue })+ }+ closeCallBack={() => handleEstimatePointCreate("remove", estimatePoint)}+ />+ ))}+ {estimatePoints && estimatePoints.length + (estimatePointCreate?.length || 0) <= maxEstimatesCount && (+ <Button+ variant="link-primary"+ size="sm"+ prependIcon={<Plus />}+ onClick={() =>+ handleEstimatePointCreate("add", {+ id: undefined,+ key: estimatePoints.length + (estimatePointCreate?.length || 0) + 1,+ value: "",+ })+ }+ >+ Add {estimateType}+ </Button>+ )}+ </div>+ );+});diff --git a/web/components/estimates/points/create.tsx b/web/components/estimates/points/create.tsxnew file mode 100644index 0000000000..909f16087f--- /dev/null+++ b/web/components/estimates/points/create.tsx@@ -0,0 +1,173 @@+import { FC, MouseEvent, FocusEvent, useState } from "react";+import { observer } from "mobx-react";+import { Check, Info, X } from "lucide-react";+import { TEstimatePointsObject, TEstimateSystemKeys } from "@plane/types";+import { Spinner, TOAST_TYPE, Tooltip, setToast } from "@plane/ui";+// constants+import { EEstimateSystem } from "@/constants/estimates";+// helpers+import { cn } from "@/helpers/common.helper";+import { isEstimatePointValuesRepeated } from "@/helpers/estimates";+// hooks+import { useEstimate } from "@/hooks/store";++type TEstimatePointCreate = {+ workspaceSlug: string;+ projectId: string;+ estimateId: string | undefined;+ estimateType: TEstimateSystemKeys;+ estimatePoints: TEstimatePointsObject[];+ handleEstimatePointValue?: (estimateValue: string) => void;+ closeCallBack: () => void;+};++export const EstimatePointCreate: FC<TEstimatePointCreate> = observer((props) => {+ const {+ workspaceSlug,+ projectId,+ estimateId,+ estimateType,+ estimatePoints,+ handleEstimatePointValue,+ closeCallBack,+ } = props;+ // hooks+ const { creteEstimatePoint } = useEstimate(estimateId);+ // states+ const [estimateInputValue, setEstimateInputValue] = useState("");+ const [loader, setLoader] = useState(false);+ const [error, setError] = useState<string | undefined>(undefined);++ const handleSuccess = (value: string) => {+ handleEstimatePointValue && handleEstimatePointValue(value);+ setEstimateInputValue("");+ closeCallBack();+ };++ const handleClose = () => {+ setEstimateInputValue("");+ closeCallBack();+ };++ const handleCreate = async (event: MouseEvent<HTMLButtonElement> | FocusEvent<HTMLInputElement, Element>) => {+ event.preventDefault();++ if (!workspaceSlug || !projectId) return;++ setError(undefined);++ if (estimateInputValue) {+ const currentEstimateType: EEstimateSystem | undefined = estimateType;+ let isEstimateValid = false;++ const currentEstimatePointValues = estimatePoints+ .map((point) => point?.value || undefined)+ .filter((value) => value != undefined) as string[];+ const isRepeated =+ (estimateType && isEstimatePointValuesRepeated(currentEstimatePointValues, estimateType, estimateInputValue)) ||+ false;++ if (!isRepeated) {+ if (currentEstimateType && [(EEstimateSystem.TIME, EEstimateSystem.POINTS)].includes(currentEstimateType)) {+ if (estimateInputValue && Number(estimateInputValue) && Number(estimateInputValue) >= 0) {+ isEstimateValid = true;+ }+ } else if (currentEstimateType && currentEstimateType === EEstimateSystem.CATEGORIES) {+ if (estimateInputValue && estimateInputValue.length > 0) {+ isEstimateValid = true;+ }+ }++ if (isEstimateValid) {+ if (estimateId != undefined) {+ try {+ setLoader(true);++ const payload = {+ key: estimatePoints?.length + 1,+ value: estimateInputValue,+ };+ await creteEstimatePoint(workspaceSlug, projectId, payload);++ setLoader(false);+ setError(undefined);+ setToast({+ type: TOAST_TYPE.SUCCESS,+ title: "Estimate point created",+ message: "The estimate point has been created successfully.",+ });+ handleClose();+ } catch {+ setLoader(false);+ setError("We are unable to process your request, please try again.");+ setToast({+ type: TOAST_TYPE.ERROR,+ title: "Estimate point creation failed",+ message: "We were unable to create the new estimate point, please try again.",+ });+ }+ } else {+ handleSuccess(estimateInputValue);+ }+ } else {+ setLoader(false);+ setError(+ [EEstimateSystem.POINTS, EEstimateSystem.TIME].includes(estimateType)+ ? "Estimate point needs to be a numeric value."+ : "Estimate point needs to be a character value."+ );+ }+ } else setError("Estimate value already exists.");+ } else setError("Estimate value cannot be empty.");+ };++ return (+ <form className="relative flex items-center gap-2 text-base">+ <div+ className={cn(+ "relative w-full border rounded flex items-center my-1",+ error ? `border-red-500` : `border-custom-border-200`+ )}+ >+ <input+ type="text"+ value={estimateInputValue}+ onChange={(e) => setEstimateInputValue(e.target.value)}+ className="border-none focus:ring-0 focus:border-0 focus:outline-none p-2.5 w-full bg-transparent"+ placeholder="Enter estimate point"+ autoFocus+ onBlur={(e) => !estimateId && handleCreate(e)}+ />+ {error && (+ <>+ <Tooltip tooltipContent={error} position="bottom">+ <div className="flex-shrink-0 w-3.5 h-3.5 overflow-hidden mr-3 relative flex justify-center items-center text-red-500">+ <Info size={14} />+ </div>+ </Tooltip>+ </>+ )}+ </div>++ {estimateId && (+ <>+ <button+ type="submit"+ className="rounded-sm w-6 h-6 flex-shrink-0 relative flex justify-center items-center hover:bg-custom-background-80 transition-colors cursor-pointer text-green-500"+ disabled={loader}+ onClick={handleCreate}+ >+ {loader ? <Spinner className="w-4 h-4" /> : <Check size={14} />}+ </button>+ <button+ className="rounded-sm w-6 h-6 flex-shrink-0 relative flex justify-center items-center hover:bg-custom-background-80 transition-colors cursor-pointer"+ onClick={handleClose}+ disabled={loader}+ >+ <X size={14} className="text-custom-text-200" />+ </button>+ </>+ )}+ </form>+ );+});diff --git a/web/components/estimates/points/delete.tsx b/web/components/estimates/points/delete.tsxnew file mode 100644index 0000000000..15f6f4848d--- /dev/null+++ b/web/components/estimates/points/delete.tsx@@ -0,0 +1,118 @@+import { FC, useState } from "react";+import { observer } from "mobx-react";+import { MoveRight, Trash2, X } from "lucide-react";+import { TEstimatePointsObject } from "@plane/types";+import { Spinner, TOAST_TYPE, setToast } from "@plane/ui";+// components+import { EstimatePointDropdown } from "@/components/estimates/points";+// hooks+import { useEstimate, useEstimatePoint } from "@/hooks/store";++type TEstimatePointDelete = {+ workspaceSlug: string;+ projectId: string;+ estimateId: string;+ estimatePointId: string;+ callback: () => void;+};++export const EstimatePointDelete: FC<TEstimatePointDelete> = observer((props) => {+ const { workspaceSlug, projectId, estimateId, estimatePointId, callback } = props;+ // hooks+ const { estimatePointIds, estimatePointById, deleteEstimatePoint } = useEstimate(estimateId);+ const { asJson: estimatePoint } = useEstimatePoint(estimateId, estimatePointId);+ // states+ const [loader, setLoader] = useState(false);+ const [estimateInputValue, setEstimateInputValue] = useState<string | undefined>(undefined);+ const [error, setError] = useState<string | undefined>(undefined);++ const handleClose = () => {+ setEstimateInputValue("");+ callback();+ };++ const handleDelete = async () => {+ if (!workspaceSlug || !projectId || !projectId) return;++ setError(undefined);++ if (estimateInputValue)+ try {+ setLoader(true);++ await deleteEstimatePoint(+ workspaceSlug,+ projectId,+ estimatePointId,+ estimateInputValue === "none" ? undefined : estimateInputValue+ );++ setLoader(false);+ setError(undefined);+ setToast({+ type: TOAST_TYPE.SUCCESS,+ title: "Estimate point updated",+ message: "The estimate point has been updated successfully.",+ });+ handleClose();+ } catch {+ setLoader(false);+ setError("something went wrong. please try again later");+ setToast({+ type: TOAST_TYPE.ERROR,+ title: "Estimate point failed to updated",+ message: "We are unable to process your request, please try again.",+ });+ }+ else setError("please select option");+ };++ // derived values+ const selectDropdownOptionIds = estimatePointIds?.filter((pointId) => pointId != estimatePointId) as string[];+ const selectDropdownOptions = (selectDropdownOptionIds || [])+ ?.map((pointId) => {+ const estimatePoint = estimatePointById(pointId);+ if (estimatePoint && estimatePoint?.id)+ return { id: estimatePoint.id, key: estimatePoint.key, value: estimatePoint.value };+ })+ .filter((estimatePoint) => estimatePoint != undefined) as TEstimatePointsObject[];++ return (+ <div className="relative flex items-center gap-2 text-base">+ <div className="flex-grow relative flex items-center gap-3">+ <div className="w-full border border-custom-border-200 rounded p-2.5 bg-custom-background-90">+ {estimatePoint?.value}+ </div>+ <div className="text-sm first-letter:relative flex justify-center items-center gap-2 whitespace-nowrap">+ Mark as <MoveRight size={14} />+ </div>+ <EstimatePointDropdown+ options={selectDropdownOptions}+ error={error}+ callback={(estimateId: string) => {+ setEstimateInputValue(estimateId);+ setError(undefined);+ }}+ />+ </div>+ {loader ? (+ <div className="w-6 h-6 flex-shrink-0 relative flex justify-center items-center rota">+ <Spinner className="w-4 h-4" />+ </div>+ ) : (+ <div+ className="rounded-sm w-6 h-6 flex-shrink-0 relative flex justify-center items-center hover:bg-custom-background-80 transition-colors cursor-pointer text-red-500"+ onClick={handleDelete}+ >+ <Trash2 size={14} />+ </div>+ )}+ <div+ className="rounded-sm w-6 h-6 flex-shrink-0 relative flex justify-center items-center hover:bg-custom-background-80 transition-colors cursor-pointer"+ onClick={handleClose}+ >+ <X size={14} className="text-custom-text-200" />+ </div>+ </div>+ );+});diff --git a/web/components/estimates/points/index.ts b/web/components/estimates/points/index.tsnew file mode 100644index 0000000000..d696a7f975--- /dev/null+++ b/web/components/estimates/points/index.ts@@ -0,0 +1,7 @@+export * from "./preview";+export * from "./create";+export * from "./update";+export * from "./delete";+export * from "./select-dropdown";++export * from "./create-root";diff --git a/web/components/estimates/points/preview.tsx b/web/components/estimates/points/preview.tsxnew file mode 100644index 0000000000..741b401de0--- /dev/null+++ b/web/components/estimates/points/preview.tsx@@ -0,0 +1,103 @@+import { FC, useEffect, useRef, useState } from "react";+import { observer } from "mobx-react";+import { GripVertical, Pencil, Trash2 } from "lucide-react";+import { TEstimatePointsObject, TEstimateSystemKeys } from "@plane/types";+// components+import { EstimatePointUpdate, EstimatePointDelete } from "@/components/estimates/points";++type TEstimatePointItemPreview = {+ workspaceSlug: string;+ projectId: string;+ estimateId: string | undefined;+ estimateType: TEstimateSystemKeys;+ estimatePointId: string | undefined;+ estimatePoint: TEstimatePointsObject;+ estimatePoints: TEstimatePointsObject[];+ handleEstimatePointValueUpdate?: (estimateValue: string) => void;+ handleEstimatePointValueRemove?: () => void;+};++export const EstimatePointItemPreview: FC<TEstimatePointItemPreview> = observer((props) => {+ const {+ workspaceSlug,+ projectId,+ estimateId,+ estimateType,+ estimatePointId,+ estimatePoint,+ estimatePoints,+ handleEstimatePointValueUpdate,+ handleEstimatePointValueRemove,+ } = props;+ // state+ const [estimatePointEditToggle, setEstimatePointEditToggle] = useState(false);+ const [estimatePointDeleteToggle, setEstimatePointDeleteToggle] = useState(false);+ // ref+ const EstimatePointValueRef = useRef<HTMLDivElement>(null);++ useEffect(() => {+ if (!estimatePointEditToggle && !estimatePointDeleteToggle)+ EstimatePointValueRef?.current?.addEventListener("dblclick", () => setEstimatePointEditToggle(true));+ }, [estimatePointDeleteToggle, estimatePointEditToggle]);++ return (+ <div>+ {!estimatePointEditToggle && !estimatePointDeleteToggle && (+ <div className="border border-custom-border-200 rounded relative flex items-center px-2.5 gap-2 text-base my-1">+ <div className="rounded-sm w-6 h-6 flex-shrink-0 relative flex justify-center items-center hover:bg-custom-background-80 transition-colors cursor-pointer">+ <GripVertical size={14} className="text-custom-text-200" />+ </div>+ <div ref={EstimatePointValueRef} className="py-2.5 w-full">+ {estimatePoint?.value ? (+ `${estimatePoint?.value}`+ ) : (+ <span className="text-custom-text-400">Enter estimate point</span>+ )}+ </div>+ <div+ className="rounded-sm w-6 h-6 flex-shrink-0 relative flex justify-center items-center hover:bg-custom-background-80 transition-colors cursor-pointer"+ onClick={() => setEstimatePointEditToggle(true)}+ >+ <Pencil size={14} className="text-custom-text-200" />+ </div>+ <div+ className="rounded-sm w-6 h-6 flex-shrink-0 relative flex justify-center items-center hover:bg-custom-background-80 transition-colors cursor-pointer"+ onClick={() =>+ estimateId && estimatePointId+ ? setEstimatePointDeleteToggle(true)+ : handleEstimatePointValueRemove && handleEstimatePointValueRemove()+ }+ >+ <Trash2 size={14} className="text-custom-text-200" />+ </div>+ </div>+ )}++ {estimatePoint && estimatePointEditToggle && (+ <EstimatePointUpdate+ workspaceSlug={workspaceSlug}+ projectId={projectId}+ estimateId={estimateId}+ estimateType={estimateType}+ estimatePointId={estimatePointId}+ estimatePoints={estimatePoints}+ estimatePoint={estimatePoint}+ handleEstimatePointValueUpdate={(estimatePointValue: string) =>+ handleEstimatePointValueUpdate && handleEstimatePointValueUpdate(estimatePointValue)+ }+ closeCallBack={() => setEstimatePointEditToggle(false)}+ />+ )}++ {estimateId && estimatePointId && estimatePointDeleteToggle && (+ <EstimatePointDelete+ workspaceSlug={workspaceSlug}+ projectId={projectId}+ estimateId={estimateId}+ estimatePointId={estimatePointId}+ callback={() => estimateId && setEstimatePointDeleteToggle(false)}+ />+ )}+ </div>+ );+});diff --git a/web/components/estimates/points/select-dropdown.tsx b/web/components/estimates/points/select-dropdown.tsxnew file mode 100644index 0000000000..9176bb6298--- /dev/null+++ b/web/components/estimates/points/select-dropdown.tsx@@ -0,0 +1,127 @@+import { FC, useRef, Fragment, useState } from "react";+import { Info, Check, ChevronDown } from "lucide-react";+import { Listbox, Transition } from "@headlessui/react";+import { TEstimatePointsObject } from "@plane/types";+import { Tooltip } from "@plane/ui";+// helpers+import { cn } from "@/helpers/common.helper";+// hooks+import useDynamicDropdownPosition from "@/hooks/use-dynamic-dropdown";+import useOutsideClickDetector from "@/hooks/use-outside-click-detector";++type TEstimatePointDropdown = {+ options: TEstimatePointsObject[];+ error: string | undefined;+ callback: (estimateId: string) => void;+};++export const EstimatePointDropdown: FC<TEstimatePointDropdown> = (props) => {+ const { options, error, callback } = props;+ // states+ const [isDropdownOpen, setIsDropdownOpen] = useState(false);+ const [selectedOption, setSelectedOption] = useState<string | undefined>(undefined);+ // ref+ const dropdownContainerRef = useRef<HTMLDivElement>(null);+ const buttonRef = useRef<HTMLButtonElement>(null);+ const dropdownRef = useRef<HTMLDivElement>(null);++ useDynamicDropdownPosition(isDropdownOpen, () => setIsDropdownOpen(false), buttonRef, dropdownRef);+ useOutsideClickDetector(dropdownContainerRef, () => setIsDropdownOpen(false));++ // derived values+ const selectedValue = selectedOption+ ? selectedOption === "none"+ ? {+ id: undefined,+ key: undefined,+ value: "None",+ }+ : options.find((option) => option?.id === selectedOption)+ : undefined;++ return (+ <div ref={dropdownContainerRef} className="w-full relative">+ <Listbox+ as="div"+ value={selectedOption}+ onChange={(selectedOption) => {+ setSelectedOption(selectedOption);+ callback(selectedOption);+ setIsDropdownOpen(false);+ }}+ className="w-full flex-shrink-0 text-left"+ >+ <Listbox.Button+ type="button"+ ref={buttonRef}+ onClick={() => setIsDropdownOpen((prev) => !prev)}+ className={cn(+ "relative w-full rounded border flex items-center gap-3 p-2.5",+ error ? `border-red-500` : `border-custom-border-200`+ )}+ >+ <div+ className={cn(`w-full text-sm text-left`, !selectedValue ? "text-custom-text-300" : "text-custom-text-100")}+ >+ {selectedValue?.value || "Select an estimate point"}+ </div>+ <ChevronDown className={`size-3 ${true ? "stroke-onboarding-text-400" : "stroke-onboarding-text-100"}`} />+ {error && (+ <>+ <Tooltip tooltipContent={error} position="bottom">+ <div className="flex-shrink-0 w-3.5 h-3.5 overflow-hidden relative flex justify-center items-center text-red-500">+ <Info size={14} />+ </div>+ </Tooltip>+ </>+ )}+ </Listbox.Button>+ <Transition+ show={isDropdownOpen}+ as={Fragment}+ enter="transition ease-out duration-100"+ enterFrom="transform opacity-0 scale-95"+ enterTo="transform opacity-100 scale-100"+ leave="transition ease-in duration-75"+ leaveFrom="transform opacity-100 scale-100"+ leaveTo="transform opacity-0 scale-95"+ >+ <Listbox.Options+ ref={dropdownRef}+ className="fixed z-10 mt-1 h-fit w-48 sm:w-60 overflow-y-auto rounded-md border border-custom-border-200 bg-custom-background-100 shadow-sm focus:outline-none"+ >+ <div className="p-1.5">+ <Listbox.Option+ value={"none"}+ className={cn(+ `cursor-pointer select-none truncate rounded px-1 py-1.5 hover:bg-custom-background-90`,+ selectedOption === "none" ? "text-custom-text-100" : "text-custom-text-300"+ )}+ >+ <div className="relative flex items-center text-wrap gap-2 px-1 py-0.5">+ <div className="text-sm font-medium w-full line-clamp-1">None</div>+ {selectedOption === "none" && <Check size={12} />}+ </div>+ </Listbox.Option>+ {options.map((option) => (+ <Listbox.Option+ key={option?.key}+ value={option?.id}+ className={cn(+ `cursor-pointer select-none truncate rounded px-1 py-1.5 hover:bg-custom-background-90`,+ selectedOption === option?.id ? "text-custom-text-100" : "text-custom-text-300"+ )}+ >+ <div className="relative flex items-center text-wrap gap-2 px-1 py-0.5">+ <div className="text-sm font-medium w-full line-clamp-1">{option.value}</div>+ {selectedOption === option?.id && <Check size={12} />}+ </div>+ </Listbox.Option>+ ))}+ </div>+ </Listbox.Options>+ </Transition>+ </Listbox>+ </div>+ );+};diff --git a/web/components/estimates/points/update.tsx b/web/components/estimates/points/update.tsxnew file mode 100644index 0000000000..4947d6930f--- /dev/null+++ b/web/components/estimates/points/update.tsx@@ -0,0 +1,184 @@+import { FC, MouseEvent, useEffect, FocusEvent, useState } from "react";+import { observer } from "mobx-react";+import { Check, Info, X } from "lucide-react";+import { TEstimatePointsObject, TEstimateSystemKeys } from "@plane/types";+import { Spinner, TOAST_TYPE, Tooltip, setToast } from "@plane/ui";+// constants+import { EEstimateSystem } from "@/constants/estimates";+// helpers+import { cn } from "@/helpers/common.helper";+import { isEstimatePointValuesRepeated } from "@/helpers/estimates";+// hooks+import { useEstimatePoint } from "@/hooks/store";++type TEstimatePointUpdate = {+ workspaceSlug: string;+ projectId: string;+ estimateId: string | undefined;+ estimatePointId: string | undefined;+ estimateType: TEstimateSystemKeys;+ estimatePoints: TEstimatePointsObject[];+ estimatePoint: TEstimatePointsObject;+ handleEstimatePointValueUpdate: (estimateValue: string) => void;+ closeCallBack: () => void;+};++export const EstimatePointUpdate: FC<TEstimatePointUpdate> = observer((props) => {+ const {+ workspaceSlug,+ projectId,+ estimateId,+ estimatePointId,+ estimateType,+ estimatePoints,+ estimatePoint,+ handleEstimatePointValueUpdate,+ closeCallBack,+ } = props;+ // hooks+ const { updateEstimatePoint } = useEstimatePoint(estimateId, estimatePointId);+ // states+ const [loader, setLoader] = useState(false);+ const [estimateInputValue, setEstimateInputValue] = useState<string | undefined>(undefined);+ const [error, setError] = useState<string | undefined>(undefined);++ useEffect(() => {+ if (estimateInputValue === undefined && estimatePoint) setEstimateInputValue(estimatePoint?.value || "");+ }, [estimateInputValue, estimatePoint]);++ const handleSuccess = (value: string) => {+ handleEstimatePointValueUpdate(value);+ setEstimateInputValue("");+ closeCallBack();+ };++ const handleClose = () => {+ setEstimateInputValue("");+ closeCallBack();+ };++ const handleUpdate = async (event: MouseEvent<HTMLButtonElement> | FocusEvent<HTMLInputElement, Element>) => {+ event.preventDefault();++ if (!workspaceSlug || !projectId) return;++ setError(undefined);++ if (estimateInputValue) {+ const currentEstimateType: EEstimateSystem | undefined = estimateType;+ let isEstimateValid = false;++ const currentEstimatePointValues = estimatePoints+ .map((point) => (point?.id != estimatePoint?.id ? point?.value : undefined))+ .filter((value) => value != undefined) as string[];+ const isRepeated =+ (estimateType && isEstimatePointValuesRepeated(currentEstimatePointValues, estimateType, estimateInputValue)) ||+ false;++ if (!isRepeated) {+ if (currentEstimateType && [(EEstimateSystem.TIME, EEstimateSystem.POINTS)].includes(currentEstimateType)) {+ if (estimateInputValue && Number(estimateInputValue) && Number(estimateInputValue) >= 0) {+ isEstimateValid = true;+ }+ } else if (currentEstimateType && currentEstimateType === EEstimateSystem.CATEGORIES) {+ if (estimateInputValue && estimateInputValue.length > 0) {+ isEstimateValid = true;+ }+ }++ if (isEstimateValid) {+ if (estimateId != undefined) {+ if (estimateInputValue === estimatePoint.value) {+ setLoader(false);+ setError(undefined);+ handleClose();+ } else+ try {+ setLoader(true);++ const payload = {+ value: estimateInputValue,+ };+ await updateEstimatePoint(workspaceSlug, projectId, payload);++ setLoader(false);+ setError(undefined);+ handleClose();+ setToast({+ type: TOAST_TYPE.SUCCESS,+ title: "Estimate modified",+ message: "The estimate point has been updated in your project.",+ });+ } catch {+ setLoader(false);+ setError("We are unable to process your request, please try again.");+ setToast({+ type: TOAST_TYPE.ERROR,+ title: "Estimate modification failed",+ message: "We were unable to modify the estimate, please try again",+ });+ }+ } else {+ handleSuccess(estimateInputValue);+ }+ } else {+ setLoader(false);+ setError(+ [EEstimateSystem.POINTS, EEstimateSystem.TIME].includes(estimateType)+ ? "Estimate point needs to be a numeric value."+ : "Estimate point needs to be a character value."+ );+ }+ } else setError("Estimate value already exists.");+ } else setError("Estimate value cannot be empty.");+ };++ return (+ <form className="relative flex items-center gap-2 text-base">+ <div+ className={cn(+ "relative w-full border rounded flex items-center my-1",+ error ? `border-red-500` : `border-custom-border-200`+ )}+ >+ <input+ type="text"+ value={estimateInputValue}+ onChange={(e) => setEstimateInputValue(e.target.value)}+ className="border-none focus:ring-0 focus:border-0 focus:outline-none p-2.5 w-full bg-transparent"+ placeholder="Enter estimate point"+ onBlur={(e) => !estimateId && handleUpdate(e)}+ autoFocus+ />+ {error && (+ <>+ <Tooltip tooltipContent={error} position="bottom">+ <div className="flex-shrink-0 w-3.5 h-3.5 overflow-hidden mr-3 relative flex justify-center items-center text-red-500">+ <Info size={14} />+ </div>+ </Tooltip>+ </>+ )}+ </div>+ {estimateId && (+ <>+ <button+ type="submit"+ className="rounded-sm w-6 h-6 flex-shrink-0 relative flex justify-center items-center hover:bg-custom-background-80 transition-colors cursor-pointer text-green-500"+ disabled={loader}+ onClick={handleUpdate}+ >+ {loader ? <Spinner className="w-4 h-4" /> : <Check size={14} />}+ </button>+ <button+ className="rounded-sm w-6 h-6 flex-shrink-0 relative flex justify-center items-center hover:bg-custom-background-80 transition-colors cursor-pointer"+ onClick={handleClose}+ disabled={loader}+ >+ <X size={14} className="text-custom-text-200" />+ </button>+ </>+ )}+ </form>+ );+});diff --git a/web/components/estimates/radio-select.tsx b/web/components/estimates/radio-select.tsxnew file mode 100644index 0000000000..f8569ea881--- /dev/null+++ b/web/components/estimates/radio-select.tsx@@ -0,0 +1,85 @@+import React from "react";+// helpers+import { cn } from "@/helpers/common.helper";++type RadioInputProps = {+ name?: string;+ label: string | React.ReactNode | undefined;+ wrapperClassName?: string;+ fieldClassName?: string;+ buttonClassName?: string;+ labelClassName?: string;+ ariaLabel?: string;+ options: { label: string | React.ReactNode; value: string; disabled?: boolean }[];+ vertical?: boolean;+ selected: string;+ onChange: (value: string) => void;+ className?: string;+};++export const RadioInput = ({+ name = "radio-input",+ label: inputLabel,+ labelClassName: inputLabelClassName = "",+ wrapperClassName: inputWrapperClassName = "",+ fieldClassName: inputFieldClassName = "",+ buttonClassName: inputButtonClassName = "",+ options,+ vertical,+ selected,+ ariaLabel,+ onChange,+ className,+}: RadioInputProps) => {+ const wrapperClass = vertical ? "flex flex-col gap-1" : "flex gap-2";++ const setSelected = (value: string) => {+ onChange(value);+ };++ let aria = ariaLabel ? ariaLabel.toLowerCase().replace(" ", "-") : "";+ if (!aria && typeof inputLabel === "string") {+ aria = inputLabel.toLowerCase().replace(" ", "-");+ } else {+ aria = "radio-input";+ }++ return (+ <div className={className}>+ <div className={cn(`mb-2`, inputLabelClassName)}>{inputLabel}</div>+ <div className={cn(`${wrapperClass}`, inputWrapperClassName)}>+ {options.map(({ value, label, disabled }, index) => (+ <div+ key={index}+ onClick={() => !disabled && setSelected(value)}+ className={cn(+ "flex items-center gap-2",+ disabled ? `bg-custom-background-200 border-custom-border-200 cursor-not-allowed` : ``,+ inputFieldClassName+ )}+ >+ <input+ id={`${name}_${index}`}+ name={name}+ className={cn(+ `group flex size-5 items-center justify-center rounded-full border border-custom-border-400 bg-custom-background-500 cursor-pointer`,+ selected === value ? `bg-custom-primary-200 border-custom-primary-100 ` : ``,+ disabled ? `bg-custom-background-200 border-custom-border-200 cursor-not-allowed` : ``,+ inputButtonClassName+ )}+ type="radio"+ value={value}+ disabled={disabled}+ checked={selected === value}+ />+ <label htmlFor={`${name}_${index}`} className="text-base cursor-pointer">+ {label}+ </label>+ </div>+ ))}+ </div>+ </div>+ );+};++export default RadioInput;diff --git a/web/components/estimates/root.tsx b/web/components/estimates/root.tsxnew file mode 100644index 0000000000..1e5df5492b--- /dev/null+++ b/web/components/estimates/root.tsx@@ -0,0 +1,118 @@+import { FC, useState } from "react";+import { observer } from "mobx-react";+import useSWR from "swr";+// components+import {+ EstimateLoaderScreen,+ EstimateEmptyScreen,+ EstimateDisableSwitch,+ CreateEstimateModal,+ UpdateEstimateModal,+ DeleteEstimateModal,+ EstimateList,+} from "@/components/estimates";+// hooks+import { useProject, useProjectEstimates } from "@/hooks/store";++type TEstimateRoot = {+ workspaceSlug: string;+ projectId: string;+ isAdmin: boolean;+};++export const EstimateRoot: FC<TEstimateRoot> = observer((props) => {+ const { workspaceSlug, projectId, isAdmin } = props;+ // hooks+ const { currentProjectDetails } = useProject();+ const { loader, currentActiveEstimateId, archivedEstimateIds, getProjectEstimates } = useProjectEstimates();+ // states+ const [isEstimateCreateModalOpen, setIsEstimateCreateModalOpen] = useState(false);+ const [estimateToUpdate, setEstimateToUpdate] = useState<string | undefined>();+ const [estimateToDelete, setEstimateToDelete] = useState<string | undefined>();++ const { isLoading: isSWRLoading } = useSWR(+ workspaceSlug && projectId ? `PROJECT_ESTIMATES_${workspaceSlug}_${projectId}` : null,+ async () => workspaceSlug && projectId && getProjectEstimates(workspaceSlug, projectId)+ );++ return (+ <div className="container mx-auto">+ {loader === "init-loader" || isSWRLoading ? (+ <EstimateLoaderScreen />+ ) : (+ <div className="space-y-12">+ {/* header */}+ <div className="text-xl font-medium text-custom-text-100 border-b border-custom-border-200 py-3.5">+ Estimates+ </div>++ {/* current active estimate section */}+ {currentActiveEstimateId ? (+ <div className="">+ {/* estimates activated deactivated section */}+ <div className="relative border-b border-custom-border-200 pb-4 flex justify-between items-center gap-3">+ <div className="space-y-1">+ <h3 className="text-lg font-medium text-custom-text-100">Enable estimates for my project</h3>+ <p className="text-sm text-custom-text-200">+ They help you in communicating complexity and workload of the team.+ </p>+ </div>+ <EstimateDisableSwitch workspaceSlug={workspaceSlug} projectId={projectId} isAdmin={isAdmin} />+ </div>+ {/* active estimates section */}+ <EstimateList+ estimateIds={[currentActiveEstimateId]}+ isAdmin={isAdmin}+ isEstimateEnabled={Boolean(currentProjectDetails?.estimate)}+ isEditable+ onEditClick={(estimateId: string) => setEstimateToUpdate(estimateId)}+ onDeleteClick={(estimateId: string) => setEstimateToDelete(estimateId)}+ />+ </div>+ ) : (+ <EstimateEmptyScreen onButtonClick={() => setIsEstimateCreateModalOpen(true)} />+ )}++ {/* archived estimates section */}+ {archivedEstimateIds && archivedEstimateIds.length > 0 && (+ <div className="">+ <div className="border-b border-custom-border-200 space-y-1 pb-4">+ <h3 className="text-lg font-medium text-custom-text-100">Archived estimates</h3>+ <p className="text-sm text-custom-text-200">+ Estimates have gone through a change, these are the estimates you had in your older versions which+ were not in use. Read more about them + <a href={"#"} target="_blank" className="text-custom-primary-100/80 hover:text-custom-primary-100">+ here.+ </a>+ </p>+ </div>+ <EstimateList estimateIds={archivedEstimateIds} isAdmin={isAdmin} />+ </div>+ )}+ </div>+ )}++ {/* CRUD modals */}+ <CreateEstimateModal+ workspaceSlug={workspaceSlug}+ projectId={projectId}+ isOpen={isEstimateCreateModalOpen}+ handleClose={() => setIsEstimateCreateModalOpen(false)}+ />+ <UpdateEstimateModal+ workspaceSlug={workspaceSlug}+ projectId={projectId}+ estimateId={estimateToUpdate ? estimateToUpdate : undefined}+ isOpen={estimateToUpdate ? true : false}+ handleClose={() => setEstimateToUpdate(undefined)}+ />+ <DeleteEstimateModal+ workspaceSlug={workspaceSlug}+ projectId={projectId}+ estimateId={estimateToDelete ? estimateToDelete : undefined}+ isOpen={estimateToDelete ? true : false}+ handleClose={() => setEstimateToDelete(undefined)}+ />+ </div>+ );+});diff --git a/web/components/estimates/update/index.ts b/web/components/estimates/update/index.tsnew file mode 100644index 0000000000..7de8cb9889--- /dev/null+++ b/web/components/estimates/update/index.ts@@ -0,0 +1,2 @@+export * from "./modal";+export * from "./stage-one";diff --git a/web/components/estimates/update/modal.tsx b/web/components/estimates/update/modal.tsxnew file mode 100644index 0000000000..69467db6f0--- /dev/null+++ b/web/components/estimates/update/modal.tsx@@ -0,0 +1,42 @@+import { FC } from "react";+import { observer } from "mobx-react";+import { Button } from "@plane/ui";+// components+import { EModalPosition, EModalWidth, ModalCore } from "@/components/core";+import { EstimateUpdateStageOne } from "@/components/estimates";++type TUpdateEstimateModal = {+ workspaceSlug: string;+ projectId: string;+ estimateId: string | undefined;+ isOpen: boolean;+ handleClose: () => void;+};++export const UpdateEstimateModal: FC<TUpdateEstimateModal> = observer((props) => {+ // props+ const { isOpen, handleClose } = props;++ return (+ <ModalCore isOpen={isOpen} handleClose={handleClose} position={EModalPosition.TOP} width={EModalWidth.XXL}>+ <div className="relative space-y-6 py-5">+ {/* heading */}+ <div className="relative flex justify-between items-center gap-2 px-5">+ <div className="relative flex items-center gap-1">+ <div className="text-xl font-medium text-custom-text-200">Edit estimate system</div>+ </div>+ </div>++ <div className="px-5">+ <EstimateUpdateStageOne />+ </div>++ <div className="relative flex justify-end items-center gap-3 px-5 pt-5 border-t border-custom-border-200">+ <Button variant="neutral-primary" size="sm" onClick={handleClose}>+ Cancel+ </Button>+ </div>+ </div>+ </ModalCore>+ );+});diff --git a/web/components/estimates/update/stage-one.tsx b/web/components/estimates/update/stage-one.tsxnew file mode 100644index 0000000000..35ce85694c--- /dev/null+++ b/web/components/estimates/update/stage-one.tsx@@ -0,0 +1,42 @@+import { FC } from "react";+import { Crown } from "lucide-react";+import { TEstimateUpdateStageKeys } from "@plane/types";+import { Tooltip } from "@plane/ui";+// constants+import { ESTIMATE_OPTIONS_STAGE_ONE } from "@/constants/estimates";+// helpers+import { cn } from "@/helpers/common.helper";++type TEstimateUpdateStageOne = {+ handleEstimateEditType?: (stage: TEstimateUpdateStageKeys) => void;+};++export const EstimateUpdateStageOne: FC<TEstimateUpdateStageOne> = (props) => {+ const { handleEstimateEditType } = props;++ return (+ <div className="space-y-3">+ {ESTIMATE_OPTIONS_STAGE_ONE &&+ ESTIMATE_OPTIONS_STAGE_ONE.map((stage) => (+ <div+ key={stage.key}+ className={cn(+ "border border-custom-border-300 cursor-pointer space-y-1 p-3 rounded transition-colors",+ stage?.is_ee ? `bg-custom-background-90` : `hover:bg-custom-background-90`+ )}+ onClick={() => !stage?.is_ee && handleEstimateEditType && handleEstimateEditType(stage.key)}+ >+ <h3 className="text-base font-medium relative flex items-center gap-2">+ {stage.title}+ {stage?.is_ee && (+ <Tooltip tooltipContent={"upgrade"}>+ <Crown size={12} className="text-amber-400" />+ </Tooltip>+ )}+ </h3>+ <p className="text-sm text-custom-text-200">{stage.description}</p>+ </div>+ ))}+ </div>+ );+};diff --git a/web/components/headers/project-issues.tsx b/web/components/headers/project-issues.tsxindex 43b270b6b8..e3983d39c0 100644--- a/web/components/headers/project-issues.tsx+++ b/web/components/headers/project-issues.tsx@@ -15,7 +15,7 @@ import { DisplayFiltersSelection, FiltersDropdown, FilterSelection, LayoutSelectimport { EIssueFilterType, EIssuesStoreType, ISSUE_DISPLAY_FILTERS_BY_LAYOUT } from "@/constants/issue";import { EUserProjectRoles } from "@/constants/project";// helpers-import { SPACE_BASE_PATH, SPACE_BASE_URL } from "@/helpers/common.helper";+import { SPACE_BASE_URL } from "@/helpers/common.helper";import { calculateTotalFilters } from "@/helpers/filter.helper";// hooksimport {@@ -100,7 +100,7 @@ export const ProjectIssuesHeader: React.FC = observer(() => {[workspaceSlug, projectId, updateFilters]);- const DEPLOY_URL = SPACE_BASE_URL + SPACE_BASE_PATH;+ const publishedURL = `${SPACE_BASE_URL}/issues/${currentProjectDetails?.anchor}`;const canUserCreateIssue =currentProjectRole && [EUserProjectRoles.ADMIN, EUserProjectRoles.MEMBER].includes(currentProjectRole);@@ -159,9 +159,9 @@ export const ProjectIssuesHeader: React.FC = observer(() => {</Tooltip>) : null}</div>- {currentProjectDetails?.is_deployed && DEPLOY_URL && (+ {currentProjectDetails?.anchor && (<a- href={`${DEPLOY_URL}/${workspaceSlug}/${currentProjectDetails?.id}`}+ href={publishedURL}className="group flex items-center gap-1.5 rounded bg-custom-primary-100/10 px-2.5 py-1 text-xs font-medium text-custom-primary-100"target="_blank"rel="noopener noreferrer"diff --git a/web/components/inbox/modals/create-edit-modal/issue-properties.tsx b/web/components/inbox/modals/create-edit-modal/issue-properties.tsxindex e55834f6e0..c501954835 100644--- a/web/components/inbox/modals/create-edit-modal/issue-properties.tsx+++ b/web/components/inbox/modals/create-edit-modal/issue-properties.tsx@@ -17,7 +17,7 @@ import { IssueLabelSelect } from "@/components/issues/select";// helpersimport { renderFormattedPayloadDate, getDate } from "@/helpers/date-time.helper";// hooks-import { useEstimate } from "@/hooks/store";+import { useProjectEstimates } from "@/hooks/store";type TInboxIssueProperties = {projectId: string;@@ -29,7 +29,7 @@ type TInboxIssueProperties = {export const InboxIssueProperties: FC<TInboxIssueProperties> = observer((props) => {const { projectId, data, handleData, isVisible = false } = props;// hooks- const { areEstimatesEnabledForProject } = useEstimate();+ const { areEstimateEnabledByProjectId } = useProjectEstimates();// statesconst [parentIssueModalOpen, setParentIssueModalOpen] = useState(false);const [selectedParentIssue, setSelectedParentIssue] = useState<ISearchIssueResponse | undefined>(undefined);@@ -142,10 +142,10 @@ export const InboxIssueProperties: FC<TInboxIssueProperties> = observer((props))}{/* estimate */}- {isVisible && areEstimatesEnabledForProject(projectId) && (+ {isVisible && projectId && areEstimateEnabledByProjectId(projectId) && (<div className="h-7"><EstimateDropdown- value={data?.estimate_point || null}+ value={data?.estimate_point || undefined}onChange={(estimatePoint) => handleData("estimate_point", estimatePoint)}projectId={projectId}buttonVariant="border-with-text"diff --git a/web/components/issues/issue-detail/issue-activity/activity/actions/estimate.tsx b/web/components/issues/issue-detail/issue-activity/activity/actions/estimate.tsxindex 9179bfa380..ef67365460 100644--- a/web/components/issues/issue-detail/issue-activity/activity/actions/estimate.tsx+++ b/web/components/issues/issue-detail/issue-activity/activity/actions/estimate.tsx@@ -2,7 +2,7 @@ import { FC } from "react";import { observer } from "mobx-react";import { Triangle } from "lucide-react";// hooks-import { useEstimate, useIssueDetail } from "@/hooks/store";+import { useIssueDetail } from "@/hooks/store";// componentsimport { IssueActivityBlockComponent, IssueLink } from "./";@@ -14,15 +14,11 @@ export const IssueEstimateActivity: FC<TIssueEstimateActivity> = observer((propsconst {activity: { getActivityById },} = useIssueDetail();- const { areEstimatesEnabledForCurrentProject, getEstimatePointValue } = useEstimate();const activity = getActivityById(activityId);if (!activity) return <></>;- const estimateValue = getEstimatePointValue(Number(activity.new_value), null);- const currentPoint = Number(activity.new_value) + 1;-return (<IssueActivityBlockComponenticon={<Triangle size={14} color="#6b7280" aria-hidden="true" />}@@ -31,15 +27,7 @@ export const IssueEstimateActivity: FC<TIssueEstimateActivity> = observer((props><>{activity.new_value ? `set the estimate point to ` : `removed the estimate point `}- {activity.new_value && (- <>- <span className="font-medium text-custom-text-100">- {areEstimatesEnabledForCurrentProject- ? estimateValue- : `${currentPoint} ${currentPoint > 1 ? "points" : "point"}`}- </span>- </>- )}+ {activity.new_value ? activity.new_value : activity?.old_value || ""}{showIssue && (activity.new_value ? ` to ` : ` from `)}{showIssue && <IssueLink activityId={activityId} />}.</>diff --git a/web/components/issues/issue-detail/issue-activity/root.tsx b/web/components/issues/issue-detail/issue-activity/root.tsxindex 1f86178347..30d10ffdbe 100644--- a/web/components/issues/issue-detail/issue-activity/root.tsx+++ b/web/components/issues/issue-detail/issue-activity/root.tsx@@ -141,7 +141,7 @@ export const IssueActivity: FC<TIssueActivity> = observer((props) => {workspaceSlug={workspaceSlug}issueId={issueId}activityOperations={activityOperations}- showAccessSpecifier={project.is_deployed}+ showAccessSpecifier={!!project.anchor}disabled={disabled}/>{!disabled && (@@ -150,7 +150,7 @@ export const IssueActivity: FC<TIssueActivity> = observer((props) => {projectId={projectId}workspaceSlug={workspaceSlug}activityOperations={activityOperations}- showAccessSpecifier={project.is_deployed}+ showAccessSpecifier={!!project.anchor}/>)}</div>@@ -161,7 +161,7 @@ export const IssueActivity: FC<TIssueActivity> = observer((props) => {workspaceSlug={workspaceSlug}issueId={issueId}activityOperations={activityOperations}- showAccessSpecifier={project.is_deployed}+ showAccessSpecifier={!!project.anchor}disabled={disabled}/>{!disabled && (@@ -170,7 +170,7 @@ export const IssueActivity: FC<TIssueActivity> = observer((props) => {projectId={projectId}workspaceSlug={workspaceSlug}activityOperations={activityOperations}- showAccessSpecifier={project.is_deployed}+ showAccessSpecifier={!!project.anchor}/>)}</div>diff --git a/web/components/issues/issue-detail/sidebar.tsx b/web/components/issues/issue-detail/sidebar.tsxindex e5526a4a81..0b62a51e8f 100644--- a/web/components/issues/issue-detail/sidebar.tsx+++ b/web/components/issues/issue-detail/sidebar.tsx@@ -54,7 +54,7 @@ import { getDate, renderFormattedPayloadDate } from "@/helpers/date-time.helper"import { shouldHighlightIssueDueDate } from "@/helpers/issue.helper";import { copyTextToClipboard } from "@/helpers/string.helper";// types-import { useEstimate, useIssueDetail, useProject, useProjectState, useUser } from "@/hooks/store";+import { useProjectEstimates, useIssueDetail, useProject, useProjectState, useUser } from "@/hooks/store";import { usePlatformOS } from "@/hooks/use-platform-os";// componentsimport type { TIssueOperations } from "./root";@@ -82,7 +82,7 @@ export const IssueDetailsSidebar: React.FC<Props> = observer((props) => {// store hooksconst { getProjectById } = useProject();const { data: currentUser } = useUser();- const { areEstimatesEnabledForCurrentProject } = useEstimate();+ const { areEstimateEnabledByProjectId } = useProjectEstimates();const {issue: { getIssueById },} = useIssueDetail();@@ -311,15 +311,17 @@ export const IssueDetailsSidebar: React.FC<Props> = observer((props) => {/></div>- {areEstimatesEnabledForCurrentProject && (+ {projectId && areEstimateEnabledByProjectId(projectId) && (<div className="flex h-8 items-center gap-2"><div className="flex w-2/5 flex-shrink-0 items-center gap-1 text-sm text-custom-text-300"><Triangle className="h-4 w-4 flex-shrink-0" /><span>Estimate</span></div><EstimateDropdown- value={issue?.estimate_point !== null ? issue.estimate_point : null}- onChange={(val) => issueOperations.update(workspaceSlug, projectId, issueId, { estimate_point: val })}+ value={issue?.estimate_point ?? undefined}+ onChange={(val: string | undefined) =>+ issueOperations.update(workspaceSlug, projectId, issueId, { estimate_point: val })+ }projectId={projectId}disabled={!isEditable}buttonVariant="transparent-with-text"diff --git a/web/components/issues/issue-layouts/properties/all-properties.tsx b/web/components/issues/issue-layouts/properties/all-properties.tsxindex 22f14833e3..7d5600a4a8 100644--- a/web/components/issues/issue-layouts/properties/all-properties.tsx+++ b/web/components/issues/issue-layouts/properties/all-properties.tsx@@ -26,7 +26,7 @@ import { cn } from "@/helpers/common.helper";import { getDate, renderFormattedPayloadDate } from "@/helpers/date-time.helper";import { shouldHighlightIssueDueDate } from "@/helpers/issue.helper";// hooks-import { useEventTracker, useEstimate, useLabel, useIssues, useProjectState, useProject } from "@/hooks/store";+import { useEventTracker, useLabel, useIssues, useProjectState, useProject, useProjectEstimates } from "@/hooks/store";import { usePlatformOS } from "@/hooks/use-platform-os";// local componentsimport { IssuePropertyLabels } from "../properties/labels";@@ -42,6 +42,9 @@ export interface IIssueProperties {}export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {+ // router+ const router = useRouter();+ const { workspaceSlug, projectId } = router.query;const { issue, updateIssue, displayProperties, activeLayout, isReadOnly, className } = props;// store hooksconst { getProjectById } = useProject();@@ -53,13 +56,10 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {const {issues: { addCycleToIssue, removeCycleFromIssue },} = useIssues(EIssuesStoreType.CYCLE);- const { areEstimatesEnabledForCurrentProject } = useEstimate();+ const { areEstimateEnabledByProjectId } = useProjectEstimates();const { getStateById } = useProjectState();const { isMobile } = usePlatformOS();const projectDetails = getProjectById(issue.project_id);- // router- const router = useRouter();- const { workspaceSlug } = router.query;const currentLayout = `${activeLayout} layout`;// derived valuesconst stateDetails = getStateById(issue.state_id);@@ -220,7 +220,7 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {);};- const handleEstimate = (value: number | null) => {+ const handleEstimate = (value: string | undefined) => {updateIssue &&updateIssue(issue.project_id, issue.id, { estimate_point: value }).then(() => {captureIssueEvent({@@ -394,11 +394,11 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {)}{/* estimates */}- {areEstimatesEnabledForCurrentProject && (+ {projectId && areEstimateEnabledByProjectId(projectId?.toString()) && (<WithDisplayPropertiesHOC displayProperties={displayProperties} displayPropertyKey="estimate"><div className="h-5" onClick={handleEventPropagation}><EstimateDropdown- value={issue.estimate_point}+ value={issue.estimate_point ?? undefined}onChange={handleEstimate}projectId={issue.project_id}disabled={isReadOnly}diff --git a/web/components/issues/issue-layouts/spreadsheet/columns/estimate-column.tsx b/web/components/issues/issue-layouts/spreadsheet/columns/estimate-column.tsxindex 2e90cd2ba5..3c8ac4b28e 100644--- a/web/components/issues/issue-layouts/spreadsheet/columns/estimate-column.tsx+++ b/web/components/issues/issue-layouts/spreadsheet/columns/estimate-column.tsx@@ -17,7 +17,7 @@ export const SpreadsheetEstimateColumn: React.FC<Props> = observer((props: Propsreturn (<div className="h-11 border-b-[0.5px] border-custom-border-200"><EstimateDropdown- value={issue.estimate_point}+ value={issue.estimate_point || undefined}onChange={(data) =>onChange(issue, { estimate_point: data }, { changed_property: "estimate_point", change_details: data })}diff --git a/web/components/issues/issue-layouts/utils.tsx b/web/components/issues/issue-layouts/utils.tsxindex c95ea748e3..891dba3068 100644--- a/web/components/issues/issue-layouts/utils.tsx+++ b/web/components/issues/issue-layouts/utils.tsx@@ -499,7 +499,7 @@ export const handleGroupDragDrop = async (// update updatedIssue values based on the source and destination groupIdsif (source.groupId && destination.groupId && source.groupId !== destination.groupId) {const groupKey = ISSUE_FILTER_DEFAULT_DATA[groupBy];- let groupValue = clone(sourceIssue[groupKey]);+ let groupValue: any = clone(sourceIssue[groupKey]);// If groupValues is an array, remove source groupId and add destination groupIdif (Array.isArray(groupValue)) {@@ -519,7 +519,7 @@ export const handleGroupDragDrop = async (// update updatedIssue values based on the source and destination subGroupIdsif (subGroupBy && source.subGroupId && destination.subGroupId && source.subGroupId !== destination.subGroupId) {const subGroupKey = ISSUE_FILTER_DEFAULT_DATA[subGroupBy];- let subGroupValue = clone(sourceIssue[subGroupKey]);+ let subGroupValue: any = clone(sourceIssue[subGroupKey]);// If subGroupValue is an array, remove source subGroupId and add destination subGroupIdif (Array.isArray(subGroupValue)) {diff --git a/web/components/issues/issue-modal/form.tsx b/web/components/issues/issue-modal/form.tsxindex 013eb498bc..7ff3ff6346 100644--- a/web/components/issues/issue-modal/form.tsx+++ b/web/components/issues/issue-modal/form.tsx@@ -28,7 +28,14 @@ import { renderFormattedPayloadDate, getDate } from "@/helpers/date-time.helper"import { getChangedIssuefields, getDescriptionPlaceholder } from "@/helpers/issue.helper";import { shouldRenderProject } from "@/helpers/project.helper";// hooks-import { useAppRouter, useEstimate, useInstance, useIssueDetail, useProject, useWorkspace } from "@/hooks/store";+import {+ useAppRouter,+ useProjectEstimates,+ useInstance,+ useIssueDetail,+ useProject,+ useWorkspace,+} from "@/hooks/store";import useKeypress from "@/hooks/use-keypress";import { useProjectIssueProperties } from "@/hooks/use-project-issue-properties";// services@@ -120,7 +127,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {const { projectId: routeProjectId } = useAppRouter();const { config } = useInstance();const { getProjectById } = useProject();- const { areEstimatesEnabledForProject } = useEstimate();+ const { areEstimateEnabledByProjectId } = useProjectEstimates();const handleKeyDown = (event: KeyboardEvent) => {if (editorRef.current?.isEditorReadyToDiscard()) {@@ -659,14 +666,14 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {)}/>)}- {areEstimatesEnabledForProject(projectId) && (+ {projectId && areEstimateEnabledByProjectId(projectId) && (<Controllercontrol={control}name="estimate_point"render={({ field: { value, onChange } }) => (<div className="h-7"><EstimateDropdown- value={value}+ value={value || undefined}onChange={(estimatePoint) => {onChange(estimatePoint);handleFormChange();diff --git a/web/components/issues/peek-overview/properties.tsx b/web/components/issues/peek-overview/properties.tsxindex 5364dacbb3..b152ae7926 100644--- a/web/components/issues/peek-overview/properties.tsx+++ b/web/components/issues/peek-overview/properties.tsx@@ -197,14 +197,14 @@ export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((pro<span>Estimate</span></div><EstimateDropdown- value={issue?.estimate_point !== null ? issue.estimate_point : null}+ value={issue.estimate_point ?? undefined}onChange={(val) => issueOperations.update(workspaceSlug, projectId, issueId, { estimate_point: val })}projectId={projectId}disabled={disabled}buttonVariant="transparent-with-text"className="w-3/4 flex-grow group"buttonContainerClassName="w-full text-left"- buttonClassName={`text-sm ${issue?.estimate_point !== null ? "" : "text-custom-text-400"}`}+ buttonClassName={`text-sm ${issue?.estimate_point !== undefined ? "" : "text-custom-text-400"}`}placeholder="None"hideIcondropdownArrowdiff --git a/web/components/modules/module-card-item.tsx b/web/components/modules/module-card-item.tsxindex ce63238b73..7377c7b2ff 100644--- a/web/components/modules/module-card-item.tsx+++ b/web/components/modules/module-card-item.tsx@@ -10,13 +10,14 @@ import { FavoriteStar } from "@/components/core";import { ButtonAvatars } from "@/components/dropdowns/member/avatar";import { ModuleQuickActions } from "@/components/modules";// constants+import { EEstimateSystem } from "@/constants/estimates";import { MODULE_FAVORITED, MODULE_UNFAVORITED } from "@/constants/event-tracker";import { MODULE_STATUS } from "@/constants/module";import { EUserProjectRoles } from "@/constants/project";// helpersimport { getDate, renderFormattedDate } from "@/helpers/date-time.helper";// hooks-import { useEventTracker, useMember, useModule, useUser } from "@/hooks/store";+import { useEventTracker, useMember, useModule, useProjectEstimates, useUser } from "@/hooks/store";import { usePlatformOS } from "@/hooks/use-platform-os";type Props = {@@ -37,6 +38,8 @@ export const ModuleCardItem: React.FC<Props> = observer((props) => {const { getModuleById, addModuleToFavorites, removeModuleFromFavorites } = useModule();const { getUserDetails } = useMember();const { captureEvent } = useEventTracker();+ const { currentActiveEstimateId, areEstimateEnabledByProjectId, estimateById } = useProjectEstimates();+// derived valuesconst moduleDetails = getModuleById(moduleId);const isEditingAllowed = !!currentProjectRole && currentProjectRole >= EUserProjectRoles.MEMBER;@@ -120,14 +123,30 @@ export const ModuleCardItem: React.FC<Props> = observer((props) => {if (!moduleDetails) return null;- const moduleTotalIssues =- moduleDetails.backlog_issues +- moduleDetails.unstarted_issues +- moduleDetails.started_issues +- moduleDetails.completed_issues +- moduleDetails.cancelled_issues;+ /**+ * NOTE: This completion percentage calculation is based on the total issues count.+ * when estimates are available and estimate type is points, we should consider the estimate point count+ * when estimates are available and estimate type is not points, then by default we consider the issue count+ */+ const isEstimateEnabled =+ projectId &&+ currentActiveEstimateId &&+ areEstimateEnabledByProjectId(projectId.toString()) &&+ estimateById(currentActiveEstimateId)?.type === EEstimateSystem.POINTS;++ const moduleTotalIssues = isEstimateEnabled+ ? moduleDetails?.total_estimate_points || 0+ : moduleDetails.backlog_issues ++ moduleDetails.unstarted_issues ++ moduleDetails.started_issues ++ moduleDetails.completed_issues ++ moduleDetails.cancelled_issues;++ const moduleCompletedIssues = isEstimateEnabled+ ? moduleDetails?.completed_estimate_points || 0+ : moduleDetails.completed_issues;- const completionPercentage = (moduleDetails.completed_issues / moduleTotalIssues) * 100;+ const completionPercentage = (moduleCompletedIssues / moduleTotalIssues) * 100;const endDate = getDate(moduleDetails.target_date);const startDate = getDate(moduleDetails.start_date);@@ -140,11 +159,11 @@ export const ModuleCardItem: React.FC<Props> = observer((props) => {const issueCount = module? !moduleTotalIssues || moduleTotalIssues === 0- ? "0 Issue"- : moduleTotalIssues === moduleDetails.completed_issues- ? `${moduleTotalIssues} Issue${moduleTotalIssues > 1 ? "s" : ""}`- : `${moduleDetails.completed_issues}/${moduleTotalIssues} Issues`- : "0 Issue";+ ? `0 ${isEstimateEnabled ? `Point` : `Issue`}`+ : moduleTotalIssues === moduleCompletedIssues+ ? `${moduleTotalIssues} Issue${moduleTotalIssues > 1 ? `s` : ``}`+ : `${moduleCompletedIssues}/${moduleTotalIssues} ${isEstimateEnabled ? `Points` : `Issues`}`+ : `0 ${isEstimateEnabled ? `Point` : `Issue`}`;const moduleLeadDetails = moduleDetails.lead_id ? getUserDetails(moduleDetails.lead_id) : undefined;diff --git a/web/components/modules/module-list-item.tsx b/web/components/modules/module-list-item.tsxindex 37b8856ef2..251e7f12fd 100644--- a/web/components/modules/module-list-item.tsx+++ b/web/components/modules/module-list-item.tsx@@ -8,8 +8,10 @@ import { CircularProgressIndicator } from "@plane/ui";// componentsimport { ListItem } from "@/components/core/list";import { ModuleListItemAction } from "@/components/modules";+// constants+import { EEstimateSystem } from "@/constants/estimates";// hooks-import { useModule } from "@/hooks/store";+import { useAppRouter, useModule, useProjectEstimates } from "@/hooks/store";import { usePlatformOS } from "@/hooks/use-platform-os";type Props = {@@ -26,14 +28,28 @@ export const ModuleListItem: React.FC<Props> = observer((props) => {// store hooksconst { getModuleById } = useModule();const { isMobile } = usePlatformOS();+ const { projectId } = useAppRouter();+ const { currentActiveEstimateId, areEstimateEnabledByProjectId, estimateById } = useProjectEstimates();// derived valuesconst moduleDetails = getModuleById(moduleId);if (!moduleDetails) return null;- const completionPercentage =- ((moduleDetails.completed_issues + moduleDetails.cancelled_issues) / moduleDetails.total_issues) * 100;+ /**+ * NOTE: This completion percentage calculation is based on the total issues count.+ * when estimates are available and estimate type is points, we should consider the estimate point count+ * when estimates are available and estimate type is not points, then by default we consider the issue count+ */+ const isEstimateEnabled =+ projectId &&+ currentActiveEstimateId &&+ areEstimateEnabledByProjectId(projectId) &&+ estimateById(currentActiveEstimateId)?.type === EEstimateSystem.POINTS;++ const completionPercentage = isEstimateEnabled+ ? ((moduleDetails?.completed_estimate_points || 0) / (moduleDetails?.total_estimate_points || 0)) * 100+ : ((moduleDetails.completed_issues + moduleDetails.cancelled_issues) / moduleDetails.total_issues) * 100;const progress = isNaN(completionPercentage) ? 0 : Math.floor(completionPercentage);diff --git a/web/components/project/publish-project/index.ts b/web/components/project/publish-project/index.tsnew file mode 100644index 0000000000..031608e25f--- /dev/null+++ b/web/components/project/publish-project/index.ts@@ -0,0 +1 @@+export * from "./modal";diff --git a/web/components/project/publish-project/index.tsx b/web/components/project/publish-project/index.tsxdeleted file mode 100644index 6bebc086cf..0000000000--- a/web/components/project/publish-project/index.tsx+++ /dev/null@@ -1,2 +0,0 @@-export * from "./modal";-export * from "./popover";diff --git a/web/components/project/publish-project/modal.tsx b/web/components/project/publish-project/modal.tsxindex c9534781ee..bec4e7f17a 100644--- a/web/components/project/publish-project/modal.tsx+++ b/web/components/project/publish-project/modal.tsx@@ -1,22 +1,19 @@-import { Fragment, useEffect, useState } from "react";+import { useEffect, useState } from "react";import { observer } from "mobx-react";import { useRouter } from "next/router";import { Controller, useForm } from "react-hook-form";+import { Check, ExternalLink, Globe2 } from "lucide-react";+// types+import { IProject, TProjectPublishLayouts, TPublishSettings } from "@plane/types";// ui-import { Check, CircleDot, Globe2 } from "lucide-react";-import { Dialog, Transition } from "@headlessui/react";-// icons-import { IProject } from "@plane/types";-// ui-import { Button, Loader, ToggleSwitch, TOAST_TYPE, setToast } from "@plane/ui";+import { Button, Loader, ToggleSwitch, TOAST_TYPE, setToast, CustomSelect } from "@plane/ui";+// components+import { EModalWidth, ModalCore } from "@/components/core";// helpers-import { SPACE_BASE_PATH, SPACE_BASE_URL } from "@/helpers/common.helper";+import { SPACE_BASE_URL } from "@/helpers/common.helper";+import { copyTextToClipboard } from "@/helpers/string.helper";// hooksimport { useProjectPublish } from "@/hooks/store";-// store-import { IProjectPublishSettings, TProjectPublishViews } from "@/store/project/project-publish.store";-// local components-import { CustomPopover } from "./popover";type Props = {isOpen: boolean;@@ -24,63 +21,47 @@ type Props = {onClose: () => void;};-type FormData = {- id: string | null;- comments: boolean;- reactions: boolean;- votes: boolean;- inbox: string | null;- views: TProjectPublishViews[];-};--const defaultValues: FormData = {- id: null,- comments: false,- reactions: false,- votes: false,+const defaultValues: Partial<TPublishSettings> = {+ is_comments_enabled: false,+ is_reactions_enabled: false,+ is_votes_enabled: false,inbox: null,- views: ["list", "kanban"],+ view_props: {+ list: true,+ kanban: true,+ },};-const viewOptions: {- key: TProjectPublishViews;+const VIEW_OPTIONS: {+ key: TProjectPublishLayouts;label: string;}[] = [{ key: "list", label: "List" },{ key: "kanban", label: "Kanban" },- // { key: "calendar", label: "Calendar" },- // { key: "gantt", label: "Gantt" },- // { key: "spreadsheet", label: "Spreadsheet" },];export const PublishProjectModal: React.FC<Props> = observer((props) => {const { isOpen, project, onClose } = props;- // hooks- // const { instance } = useInstance();// statesconst [isUnPublishing, setIsUnPublishing] = useState(false);- const [isUpdateRequired, setIsUpdateRequired] = useState(false);-- // const plane_deploy_url = instance?.config?.space_base_url || "";- const SPACE_URL = (SPACE_BASE_URL === "" ? window.location.origin : SPACE_BASE_URL) + SPACE_BASE_PATH;-// routerconst router = useRouter();const { workspaceSlug } = router.query;// store hooksconst {- projectPublishSettings,- getProjectSettingsAsync,+ fetchPublishSettings,+ getPublishSettingsByProjectID,publishProject,- updateProjectSettingsAsync,+ updatePublishSettings,unPublishProject,fetchSettingsLoader,} = useProjectPublish();+ // derived values+ const projectPublishSettings = getPublishSettingsByProjectID(project.id);// form infoconst {control,- formState: { isSubmitting },- getValues,+ formState: { isDirty, isSubmitting },handleSubmit,reset,watch,@@ -90,76 +71,35 @@ export const PublishProjectModal: React.FC<Props> = observer((props) => {const handleClose = () => {onClose();-- setIsUpdateRequired(false);- reset({ ...defaultValues });};- // prefill form with the saved settings if the project is already published- useEffect(() => {- if (projectPublishSettings && projectPublishSettings !== "not-initialized") {- let userBoards: TProjectPublishViews[] = [];-- if (projectPublishSettings?.views) {- const savedViews = projectPublishSettings?.views;-- if (!savedViews) return;-- if (savedViews.list) userBoards.push("list");- if (savedViews.kanban) userBoards.push("kanban");- if (savedViews.calendar) userBoards.push("calendar");- if (savedViews.gantt) userBoards.push("gantt");- if (savedViews.spreadsheet) userBoards.push("spreadsheet");-- userBoards = userBoards && userBoards.length > 0 ? userBoards : ["list"];- }-- const updatedData = {- id: projectPublishSettings?.id || null,- comments: projectPublishSettings?.comments || false,- reactions: projectPublishSettings?.reactions || false,- votes: projectPublishSettings?.votes || false,- inbox: projectPublishSettings?.inbox || null,- views: userBoards,- };-- reset({ ...updatedData });- }- }, [reset, projectPublishSettings, isOpen]);-// fetch publish settingsuseEffect(() => {if (!workspaceSlug || !isOpen) return;- if (projectPublishSettings === "not-initialized") {- getProjectSettingsAsync(workspaceSlug.toString(), project.id);+ if (!projectPublishSettings) {+ fetchPublishSettings(workspaceSlug.toString(), project.id);}- }, [isOpen, workspaceSlug, project, projectPublishSettings, getProjectSettingsAsync]);+ }, [fetchPublishSettings, isOpen, project, projectPublishSettings, workspaceSlug]);- const handlePublishProject = async (payload: IProjectPublishSettings) => {+ const handlePublishProject = async (payload: Partial<TPublishSettings>) => {if (!workspaceSlug) return;-- return publishProject(workspaceSlug.toString(), project.id, payload);+ await publishProject(workspaceSlug.toString(), project.id, payload);};- const handleUpdatePublishSettings = async (payload: IProjectPublishSettings) => {- if (!workspaceSlug) return;-- await updateProjectSettingsAsync(workspaceSlug.toString(), project.id, payload.id ?? "", payload)- .then((res) => {- setToast({- type: TOAST_TYPE.SUCCESS,- title: "Success!",- message: "Publish settings updated successfully!",- });+ const handleUpdatePublishSettings = async (payload: Partial<TPublishSettings>) => {+ if (!workspaceSlug || !payload.id) return;- handleClose();- return res;- })- .catch((error) => {- console.error("error", error);- return error;+ await updatePublishSettings(workspaceSlug.toString(), project.id, payload.id, payload).then((res) => {+ setToast({+ type: TOAST_TYPE.SUCCESS,+ title: "Success!",+ message: "Publish settings updated successfully!",});++ handleClose();+ return res;+ });};const handleUnPublishProject = async (publishId: string) => {@@ -172,35 +112,21 @@ export const PublishProjectModal: React.FC<Props> = observer((props) => {setToast({type: TOAST_TYPE.ERROR,title: "Error!",- message: "Something went wrong while un-publishing the project.",+ message: "Something went wrong while unpublishing the project.",})).finally(() => setIsUnPublishing(false));};- const CopyLinkToClipboard = ({ copy_link }: { copy_link: string }) => {- const [status, setStatus] = useState(false);-- const copyText = () => {- navigator.clipboard.writeText(copy_link);- setStatus(true);- setTimeout(() => {- setStatus(false);- }, 1000);- };-- return (- <div- className="flex h-[30px] min-w-[30px] cursor-pointer items-center justify-center rounded border border-custom-border-100 bg-custom-background-100 px-2 text-xs hover:bg-custom-background-90"- onClick={() => copyText()}- >- {status ? "Copied" : "Copy Link"}- </div>- );- };+ const selectedLayouts = Object.entries(watch("view_props") ?? {})+ // eslint-disable-next-line @typescript-eslint/no-unused-vars+ .filter(([key, value]) => value)+ // eslint-disable-next-line @typescript-eslint/no-unused-vars+ .map(([key, value]) => key)+ .filter((l) => VIEW_OPTIONS.find((o) => o.key === l));- const handleFormSubmit = async (formData: FormData) => {- if (!formData.views || formData.views.length === 0) {+ const handleFormSubmit = async (formData: Partial<TPublishSettings>) => {+ if (!selectedLayouts || selectedLayouts.length === 0) {setToast({type: TOAST_TYPE.ERROR,title: "Error!",@@ -209,278 +135,195 @@ export const PublishProjectModal: React.FC<Props> = observer((props) => {return;}- const payload = {- comments: formData.comments,- reactions: formData.reactions,- votes: formData.votes,- inbox: formData.inbox,- views: {- list: formData.views.includes("list"),- kanban: formData.views.includes("kanban"),- calendar: formData.views.includes("calendar"),- gantt: formData.views.includes("gantt"),- spreadsheet: formData.views.includes("spreadsheet"),- },+ const payload: Partial<TPublishSettings> = {+ id: formData.id,+ is_comments_enabled: formData.is_comments_enabled,+ is_reactions_enabled: formData.is_reactions_enabled,+ is_votes_enabled: formData.is_votes_enabled,+ view_props: formData.view_props,};- if (project.is_deployed) await handleUpdatePublishSettings({ id: watch("id") ?? "", ...payload });+ if (formData.id && project.anchor) await handleUpdatePublishSettings(payload);else await handlePublishProject(payload);};- // check if an update is required or not- const checkIfUpdateIsRequired = () => {- if (!projectPublishSettings || projectPublishSettings === "not-initialized") return;-- const currentSettings = projectPublishSettings;- const newSettings = getValues();-- if (- currentSettings.comments !== newSettings.comments ||- currentSettings.reactions !== newSettings.reactions ||- currentSettings.votes !== newSettings.votes- ) {- setIsUpdateRequired(true);- return;- }+ // prefill form values for already published projects+ useEffect(() => {+ if (!projectPublishSettings?.anchor) return;- let viewCheckFlag = 0;- viewOptions.forEach((option) => {- if (currentSettings.views[option.key] !== newSettings.views.includes(option.key)) viewCheckFlag++;+ reset({+ ...defaultValues,+ ...projectPublishSettings,});+ }, [projectPublishSettings, reset]);- if (viewCheckFlag !== 0) {- setIsUpdateRequired(true);- return;- }+ const publishLink = `${SPACE_BASE_URL}/issues/${projectPublishSettings?.anchor}`;- setIsUpdateRequired(false);- };+ const handleCopyLink = () =>+ copyTextToClipboard(publishLink).then(() =>+ setToast({+ type: TOAST_TYPE.SUCCESS,+ title: "",+ message: "Published page link copied successfully.",+ })+ );return (- <Transition.Root show={isOpen} as={Fragment}>- <Dialog as="div" className="relative z-20" onClose={handleClose}>- <Transition.Child- as={Fragment}- enter="ease-out duration-200"- enterFrom="opacity-0"- enterTo="opacity-100"- leave="ease-in duration-100"- leaveFrom="opacity-100"- leaveTo="opacity-0"- >- <div className="fixed inset-0 bg-custom-backdrop transition-opacity" />- </Transition.Child>+ <ModalCore isOpen={isOpen} handleClose={handleClose} width={EModalWidth.XXL}>+ <form onSubmit={handleSubmit(handleFormSubmit)}>+ <div className="flex items-center justify-between gap-2 p-5">+ <h5 className="text-xl font-medium text-custom-text-200">Publish page</h5>+ {project.anchor && (+ <Button variant="danger" onClick={() => handleUnPublishProject(watch("id") ?? "")} loading={isUnPublishing}>+ {isUnPublishing ? "Unpublishing" : "Unpublish"}+ </Button>+ )}+ </div>- <div className="fixed inset-0 z-20 overflow-y-auto">- <div className="flex min-h-full items-center justify-center p-4 text-center sm:p-0">- <Transition.Child- as={Fragment}- enter="ease-out duration-200"- enterFrom="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"- enterTo="opacity-100 translate-y-0 sm:scale-100"- leave="ease-in duration-100"- leaveFrom="opacity-100 translate-y-0 sm:scale-100"- leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"- >- <Dialog.Panel className="w-full transform rounded-lg bg-custom-background-100 text-left shadow-custom-shadow-md transition-all sm:w-3/5 lg:w-1/2 xl:w-2/5">- <form onSubmit={handleSubmit(handleFormSubmit)} className="space-y-4">- {/* heading */}- <div className="flex items-center justify-between gap-2 px-6 pt-4">- <h5 className="inline-block text-xl font-semibold">Publish</h5>- {project.is_deployed && (- <Button- variant="danger"- onClick={() => handleUnPublishProject(watch("id") ?? "")}- loading={isUnPublishing}- >- {isUnPublishing ? "Un-publishing..." : "Un-publish"}- </Button>- )}+ {/* content */}+ {fetchSettingsLoader ? (+ <Loader className="space-y-4 px-5">+ <Loader.Item height="30px" />+ <Loader.Item height="30px" />+ <Loader.Item height="30px" />+ <Loader.Item height="30px" />+ </Loader>+ ) : (+ <div className="px-5 space-y-4">+ {project.anchor && projectPublishSettings && (+ <>+ <div className="bg-custom-background-80 border border-custom-border-300 rounded-md py-1.5 pl-4 pr-1 flex items-center justify-between gap-2">+ <a+ href={publishLink}+ className="text-sm text-custom-text-200 truncate"+ target="_blank"+ rel="noopener noreferrer"+ >+ {publishLink}+ </a>+ <div className="flex-shrink-0 flex items-center gap-1">+ <a+ href={publishLink}+ className="size-8 grid place-items-center bg-custom-background-90 hover:bg-custom-background-100 rounded"+ target="_blank"+ rel="noopener noreferrer"+ >+ <ExternalLink className="size-4" />+ </a>+ <button+ type="button"+ className="h-8 bg-custom-background-90 hover:bg-custom-background-100 rounded text-xs font-medium py-2 px-3"+ onClick={handleCopyLink}+ >+ Copy link+ </button></div>-- {/* content */}- {fetchSettingsLoader ? (- <Loader className="space-y-4 px-6">- <Loader.Item height="30px" />- <Loader.Item height="30px" />- <Loader.Item height="30px" />- <Loader.Item height="30px" />- </Loader>- ) : (- <div className="px-6">- {project.is_deployed && (- <>- <div className="relative flex items-center gap-2 rounded-md border border-custom-border-100 bg-custom-background-80 px-3 py-2">- <div className="flex-grow truncate text-sm">- {`${SPACE_URL}/${workspaceSlug}/${project.id}`}- </div>- <div className="relative flex flex-shrink-0 items-center gap-1">- <CopyLinkToClipboard copy_link={`${SPACE_URL}/${workspaceSlug}/${project.id}`} />- </div>- </div>- <div className="mt-3 flex items-center gap-1 text-custom-primary-100">- <div className="flex h-5 w-5 items-center overflow-hidden">- <CircleDot className="h-5 w-5" />- </div>- <div className="text-sm">This project is live on web</div>- </div>- </>- )}-- <div className="mt-6 space-y-4">- <div className="relative flex items-center justify-between gap-2">- <div className="text-sm">Views</div>- <Controller- control={control}- name="views"- render={({ field: { onChange, value } }) => (- <CustomPopover- label={- value.length > 0- ? viewOptions- .filter((v) => value.includes(v.key))- .map((v) => v.label)- .join(", ")- : ``- }- placeholder="Select views"- >- <>- {viewOptions.map((option) => (- <div- key={option.key}- className={`relative m-1 flex cursor-pointer items-center justify-between gap-2 rounded-sm p-1 px-2 text-custom-text-200 ${- value.includes(option.key)- ? "bg-custom-background-80 text-custom-text-100"- : "hover:bg-custom-background-80 hover:text-custom-text-100"- }`}- onClick={() => {- const optionViews =- value.length > 0- ? value.includes(option.key)- ? value.filter((_o: string) => _o !== option.key)- : [...value, option.key]- : [option.key];-- if (optionViews.length === 0) return;-- onChange(optionViews);- checkIfUpdateIsRequired();- }}- >- <div className="text-sm">{option.label}</div>- <div className={`relative flex h-4 w-4 items-center justify-center`}>- {value.length > 0 && value.includes(option.key) && (- <Check className="h-5 w-5" />- )}- </div>- </div>- ))}- </>- </CustomPopover>- )}- />- </div>- <div className="relative flex items-center justify-between gap-2">- <div className="text-sm">Allow comments</div>- <Controller- control={control}- name="comments"- render={({ field: { onChange, value } }) => (- <ToggleSwitch- value={value}- onChange={(val) => {- onChange(val);- checkIfUpdateIsRequired();- }}- size="sm"- />- )}- />- </div>- <div className="relative flex items-center justify-between gap-2">- <div className="text-sm">Allow reactions</div>- <Controller- control={control}- name="reactions"- render={({ field: { onChange, value } }) => (- <ToggleSwitch- value={value}- onChange={(val) => {- onChange(val);- checkIfUpdateIsRequired();- }}- size="sm"- />- )}- />- </div>- <div className="relative flex items-center justify-between gap-2">- <div className="text-sm">Allow voting</div>- <Controller- control={control}- name="votes"- render={({ field: { onChange, value } }) => (- <ToggleSwitch- value={value}- onChange={(val) => {- onChange(val);- checkIfUpdateIsRequired();- }}- size="sm"- />- )}- />- </div>-- {/* toggle inbox */}- {/* <div className="relative flex justify-between items-center gap-2">- <div className="text-sm">Allow issue proposals</div>- <Controller- control={control}- name="inbox"- render={({ field: { onChange, value } }) => (- <ToggleSwitch value={value} onChange={onChange} size="sm" />- )}- />- </div> */}- </div>- </div>+ </div>+ <p className="text-sm font-medium text-custom-primary-100 flex items-center gap-1 mt-3">+ <span className="relative grid place-items-center size-2.5">+ <span className="animate-ping absolute inline-flex size-full rounded-full bg-custom-primary-100 opacity-75" />+ <span className="relative inline-flex rounded-full size-1.5 bg-custom-primary-100" />+ </span>+ This project is now live on web+ </p>+ </>+ )}+ <div className="space-y-4">+ <div className="relative flex items-center justify-between gap-2">+ <div className="text-sm">Views</div>+ <Controller+ control={control}+ name="view_props"+ render={({ field: { onChange, value } }) => (+ <CustomSelect+ value={value}+ label={VIEW_OPTIONS.filter((o) => selectedLayouts.includes(o.key))+ .map((o) => o.label)+ .join(", ")}+ onChange={(val: TProjectPublishLayouts) => {+ if (selectedLayouts.length === 1 && selectedLayouts[0] === val) return;+ onChange({+ ...value,+ [val]: !value?.[val],+ });+ }}+ buttonClassName="border-none"+ placement="bottom-end"+ >+ {VIEW_OPTIONS.map((option) => (+ <CustomSelect.Option+ key={option.key}+ value={option.key}+ className="flex items-center justify-between gap-2"+ >+ {option.label}+ {selectedLayouts.includes(option.key) && <Check className="size-3.5 flex-shrink-0" />}+ </CustomSelect.Option>+ ))}+ </CustomSelect>+ )}+ />+ </div>+ <div className="relative flex items-center justify-between gap-2">+ <div className="text-sm">Allow comments</div>+ <Controller+ control={control}+ name="is_comments_enabled"+ render={({ field: { onChange, value } }) => (+ <ToggleSwitch value={!!value} onChange={onChange} size="sm" />+ )}+ />+ </div>+ <div className="relative flex items-center justify-between gap-2">+ <div className="text-sm">Allow reactions</div>+ <Controller+ control={control}+ name="is_reactions_enabled"+ render={({ field: { onChange, value } }) => (+ <ToggleSwitch value={!!value} onChange={onChange} size="sm" />)}+ />+ </div>+ <div className="relative flex items-center justify-between gap-2">+ <div className="text-sm">Allow voting</div>+ <Controller+ control={control}+ name="is_votes_enabled"+ render={({ field: { onChange, value } }) => (+ <ToggleSwitch value={!!value} onChange={onChange} size="sm" />+ )}+ />+ </div>+ </div>+ </div>+ )}- {/* modal handlers */}- <div className="relative flex items-center justify-between border-t border-custom-border-200 px-6 py-5">- <div className="flex items-center gap-1 text-sm text-custom-text-400">- <Globe2 className="h-4 w-4" />- <div className="text-sm">Anyone with the link can access</div>- </div>- {!fetchSettingsLoader && (- <div className="relative flex items-center gap-2">- <Button variant="neutral-primary" size="sm" onClick={handleClose}>- Cancel- </Button>- {project.is_deployed ? (- <>- {isUpdateRequired && (- <Button variant="primary" size="sm" type="submit" loading={isSubmitting}>- {isSubmitting ? "Updating..." : "Update settings"}- </Button>- )}- </>- ) : (- <Button variant="primary" size="sm" type="submit" loading={isSubmitting}>- {isSubmitting ? "Publishing..." : "Publish"}- </Button>- )}- </div>- )}- </div>- </form>- </Dialog.Panel>- </Transition.Child>+ {/* modal handlers */}+ <div className="relative flex items-center justify-between border-t border-custom-border-200 px-5 py-4 mt-4">+ <div className="flex items-center gap-1 text-sm text-custom-text-400">+ <Globe2 className="size-3.5" />+ <div className="text-sm">Anyone with the link can access</div></div>+ {!fetchSettingsLoader && (+ <div className="relative flex items-center gap-2">+ <Button variant="neutral-primary" size="sm" onClick={handleClose}>+ Cancel+ </Button>+ {project.anchor ? (+ isDirty && (+ <Button variant="primary" size="sm" type="submit" loading={isSubmitting}>+ {isSubmitting ? "Updating" : "Update settings"}+ </Button>+ )+ ) : (+ <Button variant="primary" size="sm" type="submit" loading={isSubmitting}>+ {isSubmitting ? "Publishing" : "Publish"}+ </Button>+ )}+ </div>+ )}</div>- </Dialog>- </Transition.Root>+ </form>+ </ModalCore>);});diff --git a/web/components/project/publish-project/popover.tsx b/web/components/project/publish-project/popover.tsxdeleted file mode 100644index 3de915788d..0000000000--- a/web/components/project/publish-project/popover.tsx+++ /dev/null@@ -1,47 +0,0 @@-import React, { Fragment } from "react";--// headless ui-import { ChevronDown, ChevronUp } from "lucide-react";-import { Popover, Transition } from "@headlessui/react";-// icons--export const CustomPopover = ({- children,- label,- placeholder = "Select",-}: {- children: React.ReactNode;- label?: string;- placeholder?: string;-}) => (- <div className="relative">- <Popover className="relative">- {({ open }) => (- <>- <Popover.Button className={`${open ? "" : ""} relative flex items-center gap-1 outline-none ring-0`}>- <div className="text-sm">{label ?? placeholder}</div>- <div className="grid h-5 w-5 place-items-center">- {!open ? <ChevronDown className="h-4 w-4" /> : <ChevronUp className="h-4 w-4" />}- </div>- </Popover.Button>-- <Transition- as={Fragment}- enter="transition ease-out duration-200"- enterFrom="opacity-0 translate-y-1"- enterTo="opacity-100 translate-y-0"- leave="transition ease-in duration-150"- leaveFrom="opacity-100 translate-y-0"- leaveTo="opacity-0 translate-y-1"- >- <Popover.Panel className="absolute right-0 z-10 mt-1 min-w-[150px]">- <div className="mt-1 overflow-hidden overflow-y-auto rounded border border-custom-border-300 bg-custom-background-90 shadow-custom-shadow-2xs focus:outline-none">- {children}- </div>- </Popover.Panel>- </Transition>- </>- )}- </Popover>- </div>-);diff --git a/web/components/project/sidebar-list-item.tsx b/web/components/project/sidebar-list-item.tsxindex bf8e823d6d..2bf79de72c 100644--- a/web/components/project/sidebar-list-item.tsx+++ b/web/components/project/sidebar-list-item.tsx@@ -396,7 +396,7 @@ export const ProjectSidebarListItem: React.FC<Props> = observer((props) => {<div className="flex h-4 w-4 cursor-pointer items-center justify-center rounded text-custom-sidebar-text-200 transition-all duration-300 hover:bg-custom-sidebar-background-80"><Share2 className="h-3.5 w-3.5 stroke-[1.5]" /></div>- <div>{project.is_deployed ? "Publish settings" : "Publish"}</div>+ <div>{project.anchor ? "Publish settings" : "Publish"}</div></div></CustomMenu.MenuItem>)}diff --git a/web/components/workspace/sidebar-dropdown.tsx b/web/components/workspace/sidebar-dropdown.tsxindex 12b58eeca7..6b063f8e7d 100644--- a/web/components/workspace/sidebar-dropdown.tsx+++ b/web/components/workspace/sidebar-dropdown.tsx@@ -1,4 +1,4 @@-import { Fragment, useState } from "react";+import { Fragment, Ref, useState } from "react";import { observer } from "mobx-react";import Link from "next/link";import { useRouter } from "next/router";@@ -263,8 +263,8 @@ export const WorkspaceSidebarDropdown = observer(() => {><Menu.ItemsclassName="absolute left-0 z-20 mt-1 flex w-52 origin-top-left flex-col divide-y- divide-custom-sidebar-border-200 rounded-md border border-custom-sidebar-border-200 bg-custom-sidebar-background-100 px-1 py-2 text-xs shadow-lg outline-none"- ref={setPopperElement}+ divide-custom-sidebar-border-200 rounded-md border border-custom-sidebar-border-200 bg-custom-sidebar-background-100 px-1 py-2 text-xs shadow-lg outline-none"+ ref={setPopperElement as Ref<HTMLDivElement>}style={styles.popper}{...attributes.popper}>diff --git a/web/constants/analytics.ts b/web/constants/analytics.tsindex b81b0c3ac6..58abd208c6 100644--- a/web/constants/analytics.ts+++ b/web/constants/analytics.ts@@ -28,7 +28,7 @@ export const ANALYTICS_X_AXIS_VALUES: { value: TXAxisValues; label: string }[] =label: "Assignee",},{- value: "estimate_point",+ value: "estimate_point__value",label: "Estimate point",},{diff --git a/web/constants/estimates.ts b/web/constants/estimates.tsnew file mode 100644index 0000000000..f9cc58928e--- /dev/null+++ b/web/constants/estimates.ts@@ -0,0 +1,144 @@+// types+import { TEstimateSystems } from "@plane/types";++export enum EEstimateSystem {+ POINTS = "points",+ CATEGORIES = "categories",+ TIME = "time",+}++export enum EEstimateUpdateStages {+ CREATE = "create",+ EDIT = "edit",+ SWITCH = "switch",+}++export const maxEstimatesCount = 11;++export const ESTIMATE_SYSTEMS: TEstimateSystems = {+ points: {+ name: "Points",+ templates: {+ fibonacci: {+ title: "Fibonacci",+ values: [+ { id: undefined, key: 1, value: "1" },+ { id: undefined, key: 2, value: "2" },+ { id: undefined, key: 3, value: "3" },+ { id: undefined, key: 4, value: "5" },+ { id: undefined, key: 5, value: "8" },+ { id: undefined, key: 6, value: "13" },+ { id: undefined, key: 7, value: "21" },+ ],+ },+ linear: {+ title: "Linear",+ values: [+ { id: undefined, key: 1, value: "1" },+ { id: undefined, key: 2, value: "2" },+ { id: undefined, key: 3, value: "3" },+ { id: undefined, key: 4, value: "4" },+ { id: undefined, key: 5, value: "5" },+ { id: undefined, key: 6, value: "6" },+ { id: undefined, key: 7, value: "7" },+ { id: undefined, key: 8, value: "8" },+ { id: undefined, key: 9, value: "9" },+ { id: undefined, key: 10, value: "10" },+ ],+ },+ squares: {+ title: "Squares",+ values: [+ { id: undefined, key: 1, value: "1" },+ { id: undefined, key: 2, value: "4" },+ { id: undefined, key: 3, value: "9" },+ { id: undefined, key: 4, value: "16" },+ { id: undefined, key: 5, value: "25" },+ { id: undefined, key: 6, value: "36" },+ ],+ },+ custom: {+ title: "Custom",+ values: [+ { id: undefined, key: 1, value: "1" },+ { id: undefined, key: 2, value: "2" },+ ],+ hide: true,+ },+ },+ is_available: true,+ is_ee: false,+ },+ categories: {+ name: "Categories",+ templates: {+ t_shirt_sizes: {+ title: "T-Shirt Sizes",+ values: [+ { id: undefined, key: 1, value: "XS" },+ { id: undefined, key: 2, value: "S" },+ { id: undefined, key: 3, value: "M" },+ { id: undefined, key: 4, value: "L" },+ { id: undefined, key: 5, value: "XL" },+ { id: undefined, key: 6, value: "XXL" },+ ],+ },+ easy_to_hard: {+ title: "Easy to hard",+ values: [+ { id: undefined, key: 1, value: "Easy" },+ { id: undefined, key: 2, value: "Medium" },+ { id: undefined, key: 3, value: "Hard" },+ { id: undefined, key: 4, value: "Very Hard" },+ ],+ },+ custom: {+ title: "Custom",+ values: [+ { id: undefined, key: 1, value: "Easy" },+ { id: undefined, key: 2, value: "Hard" },+ ],+ hide: true,+ },+ },+ is_available: true,+ is_ee: false,+ },+ time: {+ name: "Time",+ templates: {+ hours: {+ title: "Hours",+ values: [+ { id: undefined, key: 1, value: "1" },+ { id: undefined, key: 2, value: "2" },+ { id: undefined, key: 3, value: "3" },+ { id: undefined, key: 4, value: "4" },+ { id: undefined, key: 5, value: "5" },+ { id: undefined, key: 6, value: "6" },+ { id: undefined, key: 7, value: "7" },+ { id: undefined, key: 8, value: "8" },+ { id: undefined, key: 9, value: "9" },+ { id: undefined, key: 10, value: "10" },+ ],+ },+ },+ is_available: false,+ is_ee: true,+ },+};++export const ESTIMATE_OPTIONS_STAGE_ONE = [+ {+ key: EEstimateUpdateStages.EDIT,+ title: "Add, update or remove estimates",+ description: "Manage current system either adding, updating or removing the points or categories.",+ is_ee: true,+ },+ {+ key: EEstimateUpdateStages.SWITCH,+ title: "Change estimate type",+ description: "Convert your points system to categories system and vice versa.",+ is_ee: true,+ },+];diff --git a/web/helpers/estimates.ts b/web/helpers/estimates.tsnew file mode 100644index 0000000000..cf8cd2dc84--- /dev/null+++ b/web/helpers/estimates.ts@@ -0,0 +1,33 @@+import { EEstimateSystem } from "@/constants/estimates";++export const isEstimatePointValuesRepeated = (+ estimatePoints: string[],+ estimateType: EEstimateSystem,+ newEstimatePoint?: string | undefined+) => {+ const currentEstimatePoints = estimatePoints.map((estimatePoint) => estimatePoint.trim());+ let isRepeated = false;++ if (newEstimatePoint === undefined) {+ if (estimateType === EEstimateSystem.CATEGORIES) {+ const points = new Set(currentEstimatePoints);+ if (points.size != currentEstimatePoints.length) isRepeated = true;+ } else if ([EEstimateSystem.POINTS, EEstimateSystem.TIME].includes(estimateType)) {+ currentEstimatePoints.map((point) => {+ if (Number(point) === Number(newEstimatePoint)) isRepeated = true;+ });+ }+ } else {+ if (estimateType === EEstimateSystem.CATEGORIES) {+ currentEstimatePoints.map((point) => {+ if (point === newEstimatePoint.trim()) isRepeated = true;+ });+ } else if ([EEstimateSystem.POINTS, EEstimateSystem.TIME].includes(estimateType)) {+ currentEstimatePoints.map((point) => {+ if (Number(point) === Number(newEstimatePoint.trim())) isRepeated = true;+ });+ }+ }++ return isRepeated;+};diff --git a/web/hooks/store/estimates/index.ts b/web/hooks/store/estimates/index.tsnew file mode 100644index 0000000000..3b22fbb6f9--- /dev/null+++ b/web/hooks/store/estimates/index.ts@@ -0,0 +1,3 @@+export * from "./use-project-estimate";+export * from "./use-estimate";+export * from "./use-estimate-point";diff --git a/web/hooks/store/estimates/use-estimate-point.ts b/web/hooks/store/estimates/use-estimate-point.tsnew file mode 100644index 0000000000..156934caa2--- /dev/null+++ b/web/hooks/store/estimates/use-estimate-point.ts@@ -0,0 +1,16 @@+import { useContext } from "react";+// mobx store+import { StoreContext } from "@/lib/store-context";+// mobx store+import { IEstimatePoint } from "@/store/estimates/estimate-point";++export const useEstimatePoint = (+ estimateId: string | undefined,+ estimatePointId: string | undefined+): IEstimatePoint => {+ const context = useContext(StoreContext);+ if (context === undefined) throw new Error("useEstimatePoint must be used within StoreProvider");+ if (!estimateId || !estimatePointId) return {} as IEstimatePoint;++ return context.projectEstimate.estimates?.[estimateId]?.estimatePoints?.[estimatePointId] || {};+};diff --git a/web/hooks/store/estimates/use-estimate.ts b/web/hooks/store/estimates/use-estimate.tsnew file mode 100644index 0000000000..a1c6ad4ef7--- /dev/null+++ b/web/hooks/store/estimates/use-estimate.ts@@ -0,0 +1,13 @@+import { useContext } from "react";+// mobx store+import { StoreContext } from "@/lib/store-context";+// mobx store+import { IEstimate } from "@/store/estimates/estimate";++export const useEstimate = (estimateId: string | undefined): IEstimate => {+ const context = useContext(StoreContext);+ if (context === undefined) throw new Error("useEstimate must be used within StoreProvider");+ if (!estimateId) return {} as IEstimate;++ return context.projectEstimate.estimates?.[estimateId] ?? {};+};diff --git a/web/hooks/store/estimates/use-project-estimate.ts b/web/hooks/store/estimates/use-project-estimate.tsnew file mode 100644index 0000000000..6225a1cb62--- /dev/null+++ b/web/hooks/store/estimates/use-project-estimate.ts@@ -0,0 +1,12 @@+import { useContext } from "react";+// context+import { StoreContext } from "@/lib/store-context";+// mobx store+import { IProjectEstimateStore } from "@/store/estimates/project-estimate.store";++export const useProjectEstimates = (): IProjectEstimateStore => {+ const context = useContext(StoreContext);+ if (context === undefined) throw new Error("useProjectPage must be used within StoreProvider");++ return context.projectEstimate;+};diff --git a/web/hooks/store/index.ts b/web/hooks/store/index.tsindex e9d4a638c7..d482170998 100644--- a/web/hooks/store/index.ts+++ b/web/hooks/store/index.ts@@ -3,7 +3,6 @@ export * from "./use-cycle-filter";export * from "./use-cycle";export * from "./use-event-tracker";export * from "./use-dashboard";-export * from "./use-estimate";export * from "./use-global-view";export * from "./use-label";export * from "./use-member";@@ -33,3 +32,4 @@ export * from "./use-instance";export * from "./use-app-theme";export * from "./use-command-palette";export * from "./use-app-router";+export * from "./estimates";diff --git a/web/hooks/store/use-estimate.ts b/web/hooks/store/use-estimate.tsdeleted file mode 100644index a8e65ea75f..0000000000--- a/web/hooks/store/use-estimate.ts+++ /dev/null@@ -1,11 +0,0 @@-import { useContext } from "react";-// mobx store-import { StoreContext } from "@/lib/store-context";-// types-import { IEstimateStore } from "@/store/estimate.store";--export const useEstimate = (): IEstimateStore => {- const context = useContext(StoreContext);- if (context === undefined) throw new Error("useEstimate must be used within StoreProvider");- return context.estimate;-};diff --git a/web/hooks/use-project-issue-properties.ts b/web/hooks/use-project-issue-properties.tsindex 195dd4e5c1..e06e745c3a 100644--- a/web/hooks/use-project-issue-properties.ts+++ b/web/hooks/use-project-issue-properties.ts@@ -1,4 +1,4 @@-import { useCycle, useEstimate, useLabel, useMember, useModule, useProjectState } from "./store";+import { useCycle, useProjectEstimates, useLabel, useMember, useModule, useProjectState } from "./store";export const useProjectIssueProperties = () => {const { fetchProjectStates } = useProjectState();@@ -8,7 +8,7 @@ export const useProjectIssueProperties = () => {const { fetchProjectLabels } = useLabel();const { fetchAllCycles: fetchProjectAllCycles } = useCycle();const { fetchModules: fetchProjectAllModules } = useModule();- const { fetchProjectEstimates } = useEstimate();+ const { getProjectEstimates } = useProjectEstimates();// fetching project statesconst fetchStates = async (@@ -62,7 +62,7 @@ export const useProjectIssueProperties = () => {projectId: string | string[] | undefined) => {if (workspaceSlug && projectId) {- await fetchProjectEstimates(workspaceSlug.toString(), projectId.toString());+ await getProjectEstimates(workspaceSlug.toString(), projectId.toString());}};diff --git a/web/hooks/use-workspace-issue-properties.ts b/web/hooks/use-workspace-issue-properties.tsindex 8622100aa5..4cad3a2df3 100644--- a/web/hooks/use-workspace-issue-properties.ts+++ b/web/hooks/use-workspace-issue-properties.ts@@ -1,12 +1,12 @@import useSWR from "swr";-import { useCycle, useEstimate, useLabel, useModule, useProjectState } from "./store";+import { useCycle, useProjectEstimates, useLabel, useModule, useProjectState } from "./store";export const useWorkspaceIssueProperties = (workspaceSlug: string | string[] | undefined) => {const { fetchWorkspaceLabels } = useLabel();const { fetchWorkspaceStates } = useProjectState();- const { fetchWorkspaceEstimates } = useEstimate();+ const { getWorkspaceEstimates } = useProjectEstimates();const { fetchWorkspaceModules } = useModule();@@ -43,7 +43,7 @@ export const useWorkspaceIssueProperties = (workspaceSlug: string | string[] | u// fetch workspace estimatesuseSWR(workspaceSlug ? `WORKSPACE_ESTIMATES_${workspaceSlug}` : null,- workspaceSlug ? () => fetchWorkspaceEstimates(workspaceSlug.toString()) : null,+ workspaceSlug ? () => getWorkspaceEstimates(workspaceSlug.toString()) : null,{ revalidateIfStale: false, revalidateOnFocus: false });};diff --git a/web/layouts/auth-layout/project-wrapper.tsx b/web/layouts/auth-layout/project-wrapper.tsxindex 698c1801a0..69e5b57f92 100644--- a/web/layouts/auth-layout/project-wrapper.tsx+++ b/web/layouts/auth-layout/project-wrapper.tsx@@ -9,7 +9,7 @@ import { EmptyState, LogoSpinner } from "@/components/common";import {useEventTracker,useCycle,- useEstimate,+ useProjectEstimates,useLabel,useMember,useModule,@@ -44,7 +44,7 @@ export const ProjectAuthWrapper: FC<IProjectAuthWrapper> = observer((props) => {} = useMember();const { fetchProjectStates } = useProjectState();const { fetchProjectLabels } = useLabel();- const { fetchProjectEstimates } = useEstimate();+ const { getProjectEstimates } = useProjectEstimates();// routerconst router = useRouter();const { workspaceSlug, projectId } = router.query;@@ -80,7 +80,7 @@ export const ProjectAuthWrapper: FC<IProjectAuthWrapper> = observer((props) => {// fetching project estimatesuseSWR(workspaceSlug && projectId ? `PROJECT_ESTIMATES_${workspaceSlug}_${projectId}` : null,- workspaceSlug && projectId ? () => fetchProjectEstimates(workspaceSlug.toString(), projectId.toString()) : null,+ workspaceSlug && projectId ? () => getProjectEstimates(workspaceSlug.toString(), projectId.toString()) : null,{ revalidateIfStale: false, revalidateOnFocus: false });// fetching project cyclesdiff --git a/web/next.config.js b/web/next.config.jsindex 2a69a01a7d..ea6f9e7edc 100644--- a/web/next.config.js+++ b/web/next.config.js@@ -35,24 +35,24 @@ const nextConfig = {{source: "/accounts/sign-up",destination: "/sign-up",- permanent: true+ permanent: true,},{source: "/sign-in",destination: "/",- permanent: true+ permanent: true,},{source: "/register",destination: "/sign-up",- permanent: true+ permanent: true,},{source: "/login",destination: "/",- permanent: true- }- ]+ permanent: true,+ },+ ];},async rewrites() {const posthogHost = process.env.NEXT_PUBLIC_POSTHOG_HOST || "https://app.posthog.com"@@ -67,9 +67,9 @@ const nextConfig = {},];if (process.env.NEXT_PUBLIC_ADMIN_BASE_URL || process.env.NEXT_PUBLIC_ADMIN_BASE_PATH) {- const ADMIN_BASE_URL = process.env.NEXT_PUBLIC_ADMIN_BASE_URL || ""- const ADMIN_BASE_PATH = process.env.NEXT_PUBLIC_ADMIN_BASE_PATH || ""- const GOD_MODE_BASE_URL = ADMIN_BASE_URL + ADMIN_BASE_PATH+ const ADMIN_BASE_URL = process.env.NEXT_PUBLIC_ADMIN_BASE_URL || "";+ const ADMIN_BASE_PATH = process.env.NEXT_PUBLIC_ADMIN_BASE_PATH || "";+ const GOD_MODE_BASE_URL = ADMIN_BASE_URL + ADMIN_BASE_PATH;rewrites.push({source: "/god-mode",destination: `${GOD_MODE_BASE_URL}/`,@@ -77,7 +77,7 @@ const nextConfig = {rewrites.push({source: "/god-mode/:path*",destination: `${GOD_MODE_BASE_URL}/:path*`,- })+ });}return rewrites;},diff --git a/web/package.json b/web/package.jsonindex cc374596be..de65042771 100644--- a/web/package.json+++ b/web/package.json@@ -69,17 +69,17 @@"@types/dompurify": "^3.0.5","@types/js-cookie": "^3.0.2","@types/lodash": "^4.14.202",- "@types/node": "18.0.6",+ "@types/node": "18.16.1","@types/nprogress": "^0.2.0",- "@types/react": "^18.2.42",+ "@types/react": "^18.2.48","@types/react-color": "^3.0.6",- "@types/react-dom": "^18.2.17",+ "@types/react-dom": "^18.2.18","@types/uuid": "^8.3.4","@types/zxcvbn": "^4.4.4","eslint-config-custom": "*","prettier": "^3.2.5","tailwind-config-custom": "*","tsconfig": "*",- "typescript": "4.7.4"+ "typescript": "^5.4.2"}}diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/settings/estimates.tsx b/web/pages/[workspaceSlug]/projects/[projectId]/settings/estimates.tsxindex 83bd4fd259..c3426ee946 100644--- a/web/pages/[workspaceSlug]/projects/[projectId]/settings/estimates.tsx+++ b/web/pages/[workspaceSlug]/projects/[projectId]/settings/estimates.tsx@@ -1,33 +1,38 @@import { ReactElement } from "react";import { observer } from "mobx-react";-// hooks+import { useRouter } from "next/router";+// componentsimport { PageHead } from "@/components/core";-import { EstimatesList } from "@/components/estimates";+import { EstimateRoot } from "@/components/estimates";import { ProjectSettingHeader } from "@/components/headers";+// constantsimport { EUserProjectRoles } from "@/constants/project";+// hooksimport { useUser, useProject } from "@/hooks/store";// layoutsimport { AppLayout } from "@/layouts/app-layout";import { ProjectSettingLayout } from "@/layouts/settings-layout";-// components// typesimport { NextPageWithLayout } from "@/lib/types";-// constantsconst EstimatesSettingsPage: NextPageWithLayout = observer(() => {+ const router = useRouter();+ const { workspaceSlug, projectId } = router.query;const {membership: { currentProjectRole },} = useUser();const { currentProjectDetails } = useProject();+// derived valuesconst isAdmin = currentProjectRole === EUserProjectRoles.ADMIN;const pageTitle = currentProjectDetails?.name ? `${currentProjectDetails?.name} - Estimates` : undefined;+ if (!workspaceSlug || !projectId) return <></>;return (<><PageHead title={pageTitle} />- <div className={`w-full overflow-y-auto py-8 pr-9 ${isAdmin ? "" : "pointer-events-none opacity-60"}`}>- <EstimatesList />+ <div className={`w-full overflow-y-auto py-8 pr-9 ${isAdmin ? "" : "pointer-events-none opacity-60"}`}>+ <EstimateRoot workspaceSlug={workspaceSlug?.toString()} projectId={projectId?.toString()} isAdmin={isAdmin} /></div></>);diff --git a/web/public/empty-state/estimates/dark.svg b/web/public/empty-state/estimates/dark.svgnew file mode 100644index 0000000000..2f5d7589f2--- /dev/null+++ b/web/public/empty-state/estimates/dark.svg@@ -0,0 +1,19 @@+<svg width="98" height="121" viewBox="0 0 98 121" fill="none" xmlns="http://www.w3.org/2000/svg">+<path d="M14.8707 74.5375C16.3076 72.9545 18.6808 73.4171 20.2598 74.5344C22.2919 75.9722 22.873 78.598 23.1728 80.9255C23.6803 84.8657 23.8304 90.4355 28.2986 92.0828C30.363 92.8439 32.7261 92.2154 34.4697 90.9796C36.3742 89.6297 37.5622 87.5534 38.3579 85.4014C39.3213 82.796 39.879 80.0089 40.3517 77.2785C40.8351 74.4863 41.1519 71.664 41.2941 68.8338C41.4333 66.0649 41.3427 63.3142 41.2327 60.5471C41.1467 58.3866 41.1139 56.1179 41.8437 54.052C42.5808 51.9655 44.2945 50.3785 46.5478 50.1692C48.7349 49.966 50.9875 50.8883 52.57 52.3768C56.3668 55.9484 56.5454 61.7791 57.3941 66.5679C57.8399 69.084 58.4917 71.63 59.8579 73.819C60.9816 75.6193 62.5432 77.1286 64.3419 78.2484C67.9699 80.507 72.5929 81.1661 76.6187 79.6144C80.5491 78.0995 83.713 74.7878 85.082 70.8073C85.4201 69.8243 85.6289 68.8088 85.7348 67.7756C85.7841 67.2952 85.0326 67.2986 84.9838 67.7756C84.5336 72.1666 81.715 76.1433 77.8526 78.2259C73.8783 80.3689 69.0654 80.097 65.1824 77.8754C63.2735 76.7832 61.6129 75.2427 60.4591 73.364C59.0598 71.0857 58.4606 68.4301 58.0247 65.8227C57.2373 61.1135 56.8802 55.7066 53.3508 52.0908C50.6136 49.2866 45.5767 48.1613 42.635 51.2848C39.6059 54.501 40.5139 59.682 40.6106 63.6745C40.7523 69.5217 40.1494 75.3825 38.8131 81.0769C38.2314 83.5555 37.5623 86.1115 36.1024 88.2369C34.7681 90.1793 32.5875 91.6848 30.1594 91.6609C27.7378 91.637 26.0364 89.8572 25.1768 87.7354C24.2698 85.4969 24.2104 83.0793 23.8965 80.7163C23.6084 78.5472 23.0835 76.1467 21.4568 74.5592C20.1918 73.3248 18.3152 72.5301 16.5348 72.814C15.6794 72.9505 14.9208 73.3661 14.3396 74.0064C14.0153 74.3636 14.5449 74.8963 14.8707 74.5375Z" fill="#3F76FF"/>+<path d="M55.4847 43.7299H38.3499C37.9179 43.7299 37.5664 43.3784 37.5664 42.9464C37.5664 42.5144 37.9179 42.1631 38.3499 42.1631H55.4847C55.9167 42.1631 56.268 42.5144 56.268 42.9464C56.268 43.3784 55.9167 43.7299 55.4847 43.7299Z" fill="#363A3F"/>+<path d="M81.9847 89.2953H64.8499C64.4179 89.2953 64.0664 88.9438 64.0664 88.5118C64.0664 88.0798 64.4179 87.7285 64.8499 87.7285H81.9847C82.4167 87.7285 82.768 88.0798 82.768 88.5118C82.768 88.9438 82.4167 89.2953 81.9847 89.2953Z" fill="#363A3F"/>+<path d="M96.0179 120.34H78.8831C78.4511 120.34 78.0996 119.989 78.0996 119.557C78.0996 119.125 78.4511 118.773 78.8831 118.773H96.0179C96.4499 118.773 96.8012 119.125 96.8012 119.557C96.8012 119.989 96.4499 120.34 96.0179 120.34Z" fill="#363A3F"/>+<path d="M17.9183 26.7064H0.78347C0.351487 26.7064 0 26.3549 0 25.923C0 25.491 0.351492 25.1396 0.78347 25.1396H17.9183C18.3503 25.1396 18.7016 25.491 18.7016 25.923C18.7016 26.3549 18.3503 26.7064 17.9183 26.7064Z" fill="#363A3F"/>+<path d="M87.2283 111.247H9.56712C9.29059 111.247 9.06641 111.023 9.06641 110.746V36.6404C9.06641 36.3636 9.2906 36.1396 9.56712 36.1396C9.84364 36.1396 10.0678 36.3636 10.0678 36.6404V66.8777C10.0678 90.8292 29.4843 110.246 53.4358 110.246H87.2283C87.5048 110.246 87.729 110.47 87.729 110.746C87.729 111.023 87.5048 111.247 87.2283 111.247Z" fill="#363A3F"/>+<path d="M25.9613 81.4652H8.82644C8.39446 81.4652 8.04297 81.1137 8.04297 80.6817C8.04297 80.2498 8.39446 79.8984 8.82644 79.8984H25.9613C26.3932 79.8984 26.7446 80.2498 26.7446 80.6817C26.7446 81.1137 26.3932 81.4652 25.9613 81.4652Z" fill="#363A3F"/>+<path d="M14.8118 76.609C16.0562 76.609 17.065 75.6002 17.065 74.3558C17.065 73.1113 16.0562 72.1025 14.8118 72.1025C13.5674 72.1025 12.5586 73.1113 12.5586 74.3558C12.5586 75.6002 13.5674 76.609 14.8118 76.609Z" fill="#2E2E2E"/>+<path d="M29.8431 94.1344C31.0875 94.1344 32.0963 93.1256 32.0963 91.8812C32.0963 90.6367 31.0875 89.6279 29.8431 89.6279C28.5986 89.6279 27.5898 90.6367 27.5898 91.8812C27.5898 93.1256 28.5986 94.1344 29.8431 94.1344Z" fill="#2E2E2E"/>+<path d="M46.8587 52.0738C48.1031 52.0738 49.1119 51.065 49.1119 49.8206C49.1119 48.5762 48.1031 47.5674 46.8587 47.5674C45.6143 47.5674 44.6055 48.5762 44.6055 49.8206C44.6055 51.065 45.6143 52.0738 46.8587 52.0738Z" fill="#2E2E2E"/>+<path d="M71.8997 82.1178C73.1441 82.1178 74.1529 81.109 74.1529 79.8646C74.1529 78.6201 73.1441 77.6113 71.8997 77.6113C70.6553 77.6113 69.6465 78.6201 69.6465 79.8646C69.6465 81.109 70.6553 82.1178 71.8997 82.1178Z" fill="#2E2E2E"/>+<path d="M86.4368 70.1012C87.6812 70.1012 88.69 69.0924 88.69 67.8479C88.69 66.6035 87.6812 65.5947 86.4368 65.5947C85.1924 65.5947 84.1836 66.6035 84.1836 67.8479C84.1836 69.0924 85.1924 70.1012 86.4368 70.1012Z" fill="#2E2E2E"/>+<path d="M82.1267 20.0406L86.2476 21.9926C84.5574 19.6339 83.101 15.95 82.3213 13.0186C81.0011 15.7492 78.873 19.0903 76.7664 21.0861L81.1217 19.9656C78.438 33.1184 68.3439 42.5608 56.7847 42.5608L56.6211 43.0359C68.6949 43.0359 79.3865 33.7244 82.1267 20.0406Z" fill="#2E2E2E"/>+<path d="M69.6669 0H95.7042C96.8085 0 97.7071 0.8985 97.7071 2.00286C97.7071 3.10723 96.8085 4.00573 95.7042 4.00573H69.6669C68.5626 4.00573 67.6641 3.10723 67.6641 2.00286C67.6641 0.8985 68.5626 0 69.6669 0Z" fill="#3F76FF"/>+<path d="M87.2735 115.346C86.999 115.346 86.722 115.285 86.4582 115.162C85.8076 114.856 85.399 114.245 85.3658 113.527L85.0959 107.706C85.0612 106.958 85.4514 106.278 86.1144 105.931C86.7772 105.584 87.5586 105.651 88.153 106.105L92.1177 109.137C92.5944 109.502 92.8668 110.055 92.8648 110.655C92.8631 111.255 92.5873 111.806 92.1084 112.168L88.4136 114.958C88.0726 115.215 87.6757 115.346 87.2735 115.346Z" fill="#363A3F"/>+<path d="M14.2019 37.1274C14.2019 37.402 14.1407 37.679 14.017 37.9428C13.7114 38.5934 13.1002 39.0019 12.3824 39.0352L6.56105 39.3051C5.8134 39.3398 5.13372 38.9496 4.78654 38.2865C4.43937 37.6237 4.50684 36.8423 4.96062 36.248L7.99279 32.2833C8.35708 31.8066 8.9106 31.5342 9.51009 31.5361C10.1106 31.5379 10.6616 31.8136 11.0235 32.2926L13.8131 35.9873C14.0703 36.3284 14.2019 36.7252 14.2019 37.1274Z" fill="#363A3F"/>+<path d="M46.6797 31.9697C43.7154 31.2596 40.5482 31.9023 38.0143 33.5762C35.3571 35.3315 33.5978 38.1422 33.0023 41.2561C31.7737 47.6804 35.5272 54.0982 41.4594 56.6551C47.6955 59.343 55.114 57.5394 59.6426 52.5507C61.8873 50.078 63.2901 46.9499 63.7125 43.6419C64.1286 40.383 63.654 36.6231 61.6807 33.9032C59.7234 31.2053 56.464 30.3 53.3163 29.8579C50.262 29.4289 46.2102 29.2424 44.5587 32.4752C44.2438 33.0916 44.0958 33.7558 44.1307 34.4471C44.155 34.9281 44.9062 34.931 44.8818 34.4471C44.8055 32.9356 45.8132 31.6726 47.1049 30.9933C48.6018 30.206 50.4074 30.2726 52.04 30.4481C54.9873 30.7649 58.3335 31.3301 60.459 33.5937C62.5762 35.8486 63.2109 39.2849 63.0795 42.2781C62.9423 45.4023 61.8658 48.4773 59.9796 50.976C56.2574 55.9067 49.7451 58.2525 43.754 56.6597C37.9165 55.1076 37.8402 51.6433 37.9365 45.5083C37.9879 42.2354 34.8963 37.0837 37.4205 34.9508C39.8919 32.8626 43.3172 31.9363 46.4801 32.6939C46.9499 32.8065 47.1503 32.0824 46.6797 31.9697Z" fill="#3F76FF"/>+</svg>diff --git a/web/public/empty-state/estimates/light.svg b/web/public/empty-state/estimates/light.svgnew file mode 100644index 0000000000..817b9fb12b--- /dev/null+++ b/web/public/empty-state/estimates/light.svg@@ -0,0 +1,19 @@+<svg width="98" height="121" viewBox="0 0 98 121" fill="none" xmlns="http://www.w3.org/2000/svg">+<path d="M14.8707 74.5375C16.3076 72.9545 18.6808 73.4171 20.2598 74.5344C22.2919 75.9722 22.873 78.598 23.1728 80.9255C23.6803 84.8657 23.8304 90.4355 28.2986 92.0828C30.363 92.8439 32.7261 92.2154 34.4697 90.9796C36.3742 89.6297 37.5622 87.5534 38.3579 85.4014C39.3213 82.796 39.879 80.0089 40.3517 77.2785C40.8351 74.4863 41.1519 71.664 41.2941 68.8338C41.4333 66.0649 41.3427 63.3142 41.2327 60.5471C41.1467 58.3866 41.1139 56.1179 41.8437 54.052C42.5808 51.9655 44.2945 50.3785 46.5478 50.1692C48.7349 49.966 50.9875 50.8883 52.57 52.3768C56.3668 55.9484 56.5454 61.7791 57.3941 66.5679C57.8399 69.084 58.4917 71.63 59.8579 73.819C60.9816 75.6193 62.5432 77.1286 64.3419 78.2484C67.9699 80.507 72.5929 81.1661 76.6187 79.6144C80.5491 78.0995 83.713 74.7878 85.082 70.8073C85.4201 69.8243 85.6289 68.8088 85.7348 67.7756C85.7841 67.2952 85.0326 67.2986 84.9838 67.7756C84.5336 72.1666 81.715 76.1433 77.8526 78.2259C73.8783 80.3689 69.0654 80.097 65.1824 77.8754C63.2735 76.7832 61.6129 75.2427 60.4591 73.364C59.0598 71.0857 58.4606 68.4301 58.0247 65.8227C57.2373 61.1135 56.8802 55.7066 53.3508 52.0908C50.6136 49.2866 45.5767 48.1613 42.635 51.2848C39.6059 54.501 40.5139 59.682 40.6106 63.6745C40.7523 69.5217 40.1494 75.3825 38.8131 81.0769C38.2314 83.5555 37.5623 86.1115 36.1024 88.2369C34.7681 90.1793 32.5875 91.6848 30.1594 91.6609C27.7378 91.637 26.0364 89.8572 25.1768 87.7354C24.2698 85.4969 24.2104 83.0793 23.8965 80.7163C23.6084 78.5472 23.0835 76.1467 21.4568 74.5592C20.1918 73.3248 18.3152 72.5301 16.5348 72.814C15.6794 72.9505 14.9208 73.3661 14.3396 74.0064C14.0153 74.3636 14.5449 74.8963 14.8707 74.5375Z" fill="#3F76FF"/>+<path d="M55.4847 43.7299H38.3499C37.9179 43.7299 37.5664 43.3784 37.5664 42.9464C37.5664 42.5144 37.9179 42.1631 38.3499 42.1631H55.4847C55.9167 42.1631 56.268 42.5144 56.268 42.9464C56.268 43.3784 55.9167 43.7299 55.4847 43.7299Z" fill="#D9D9E0"/>+<path d="M81.9847 89.2953H64.8499C64.4179 89.2953 64.0664 88.9438 64.0664 88.5118C64.0664 88.0798 64.4179 87.7285 64.8499 87.7285H81.9847C82.4167 87.7285 82.768 88.0798 82.768 88.5118C82.768 88.9438 82.4167 89.2953 81.9847 89.2953Z" fill="#D9D9E0"/>+<path d="M96.0179 120.34H78.8831C78.4511 120.34 78.0996 119.989 78.0996 119.557C78.0996 119.125 78.4511 118.773 78.8831 118.773H96.0179C96.4499 118.773 96.8012 119.125 96.8012 119.557C96.8012 119.989 96.4499 120.34 96.0179 120.34Z" fill="#D9D9E0"/>+<path d="M17.9183 26.7064H0.78347C0.351487 26.7064 0 26.3549 0 25.923C0 25.491 0.351492 25.1396 0.78347 25.1396H17.9183C18.3503 25.1396 18.7016 25.491 18.7016 25.923C18.7016 26.3549 18.3503 26.7064 17.9183 26.7064Z" fill="#D9D9E0"/>+<path d="M87.2283 111.247H9.56712C9.29059 111.247 9.06641 111.023 9.06641 110.746V36.6404C9.06641 36.3636 9.2906 36.1396 9.56712 36.1396C9.84364 36.1396 10.0678 36.3636 10.0678 36.6404V66.8777C10.0678 90.8292 29.4843 110.246 53.4358 110.246H87.2283C87.5048 110.246 87.729 110.47 87.729 110.746C87.729 111.023 87.5048 111.247 87.2283 111.247Z" fill="#D9D9E0"/>+<path d="M25.9613 81.4652H8.82644C8.39446 81.4652 8.04297 81.1137 8.04297 80.6817C8.04297 80.2498 8.39446 79.8984 8.82644 79.8984H25.9613C26.3932 79.8984 26.7446 80.2498 26.7446 80.6817C26.7446 81.1137 26.3932 81.4652 25.9613 81.4652Z" fill="#D9D9E0"/>+<path d="M14.8118 76.609C16.0562 76.609 17.065 75.6002 17.065 74.3558C17.065 73.1113 16.0562 72.1025 14.8118 72.1025C13.5674 72.1025 12.5586 73.1113 12.5586 74.3558C12.5586 75.6002 13.5674 76.609 14.8118 76.609Z" fill="#2E2E2E"/>+<path d="M29.8431 94.1344C31.0875 94.1344 32.0963 93.1256 32.0963 91.8812C32.0963 90.6367 31.0875 89.6279 29.8431 89.6279C28.5986 89.6279 27.5898 90.6367 27.5898 91.8812C27.5898 93.1256 28.5986 94.1344 29.8431 94.1344Z" fill="#2E2E2E"/>+<path d="M46.8587 52.0738C48.1031 52.0738 49.1119 51.065 49.1119 49.8206C49.1119 48.5762 48.1031 47.5674 46.8587 47.5674C45.6143 47.5674 44.6055 48.5762 44.6055 49.8206C44.6055 51.065 45.6143 52.0738 46.8587 52.0738Z" fill="#2E2E2E"/>+<path d="M71.8997 82.1178C73.1441 82.1178 74.1529 81.109 74.1529 79.8646C74.1529 78.6201 73.1441 77.6113 71.8997 77.6113C70.6553 77.6113 69.6465 78.6201 69.6465 79.8646C69.6465 81.109 70.6553 82.1178 71.8997 82.1178Z" fill="#2E2E2E"/>+<path d="M86.4368 70.1012C87.6812 70.1012 88.69 69.0924 88.69 67.8479C88.69 66.6035 87.6812 65.5947 86.4368 65.5947C85.1924 65.5947 84.1836 66.6035 84.1836 67.8479C84.1836 69.0924 85.1924 70.1012 86.4368 70.1012Z" fill="#2E2E2E"/>+<path d="M82.1267 20.0406L86.2476 21.9926C84.5574 19.6339 83.101 15.95 82.3213 13.0186C81.0011 15.7492 78.873 19.0903 76.7664 21.0861L81.1217 19.9656C78.438 33.1184 68.3439 42.5608 56.7847 42.5608L56.6211 43.0359C68.6949 43.0359 79.3865 33.7244 82.1267 20.0406Z" fill="#2E2E2E"/>+<path d="M69.6669 0H95.7042C96.8085 0 97.7071 0.8985 97.7071 2.00286C97.7071 3.10723 96.8085 4.00573 95.7042 4.00573H69.6669C68.5626 4.00573 67.6641 3.10723 67.6641 2.00286C67.6641 0.8985 68.5626 0 69.6669 0Z" fill="#3F76FF"/>+<path d="M87.2735 115.346C86.999 115.346 86.722 115.285 86.4582 115.162C85.8076 114.856 85.399 114.245 85.3658 113.527L85.0959 107.706C85.0612 106.958 85.4514 106.278 86.1144 105.931C86.7772 105.584 87.5586 105.651 88.153 106.105L92.1177 109.137C92.5944 109.502 92.8668 110.055 92.8648 110.655C92.8631 111.255 92.5873 111.806 92.1084 112.168L88.4136 114.958C88.0726 115.215 87.6757 115.346 87.2735 115.346Z" fill="#D9D9E0"/>+<path d="M14.2019 37.1274C14.2019 37.402 14.1407 37.679 14.017 37.9428C13.7114 38.5934 13.1002 39.0019 12.3824 39.0352L6.56105 39.3051C5.8134 39.3398 5.13372 38.9496 4.78654 38.2865C4.43937 37.6237 4.50684 36.8423 4.96062 36.248L7.99279 32.2833C8.35708 31.8066 8.9106 31.5342 9.51009 31.5361C10.1106 31.5379 10.6616 31.8136 11.0235 32.2926L13.8131 35.9873C14.0703 36.3284 14.2019 36.7252 14.2019 37.1274Z" fill="#D9D9E0"/>+<path d="M46.6797 31.9697C43.7154 31.2596 40.5482 31.9023 38.0143 33.5762C35.3571 35.3315 33.5978 38.1422 33.0023 41.2561C31.7737 47.6804 35.5272 54.0982 41.4594 56.6551C47.6955 59.343 55.114 57.5394 59.6426 52.5507C61.8873 50.078 63.2901 46.9499 63.7125 43.6419C64.1286 40.383 63.654 36.6231 61.6807 33.9032C59.7234 31.2053 56.464 30.3 53.3163 29.8579C50.262 29.4289 46.2102 29.2424 44.5587 32.4752C44.2438 33.0916 44.0958 33.7558 44.1307 34.4471C44.155 34.9281 44.9062 34.931 44.8818 34.4471C44.8055 32.9356 45.8132 31.6726 47.1049 30.9933C48.6018 30.206 50.4074 30.2726 52.04 30.4481C54.9873 30.7649 58.3335 31.3301 60.459 33.5937C62.5762 35.8486 63.2109 39.2849 63.0795 42.2781C62.9423 45.4023 61.8658 48.4773 59.9796 50.976C56.2574 55.9067 49.7451 58.2525 43.754 56.6597C37.9165 55.1076 37.8402 51.6433 37.9365 45.5083C37.9879 42.2354 34.8963 37.0837 37.4205 34.9508C39.8919 32.8626 43.3172 31.9363 46.4801 32.6939C46.9499 32.8065 47.1503 32.0824 46.6797 31.9697Z" fill="#3F76FF"/>+</svg>diff --git a/web/services/project/estimate.service.ts b/web/services/project/estimate.service.tsnew file mode 100644index 0000000000..cbb81c43fc--- /dev/null+++ b/web/services/project/estimate.service.ts@@ -0,0 +1,138 @@+// types+import { IEstimate, IEstimateFormData, IEstimatePoint } from "@plane/types";+// helpers+import { API_BASE_URL } from "@/helpers/common.helper";+// services+import { APIService } from "@/services/api.service";++class EstimateService extends APIService {+ constructor() {+ super(API_BASE_URL);+ }++ async fetchWorkspaceEstimates(workspaceSlug: string): Promise<IEstimate[] | undefined> {+ try {+ const { data } = await this.get(`/api/workspaces/${workspaceSlug}/estimates/`);+ return data || undefined;+ } catch (error) {+ throw error;+ }+ }++ async fetchProjectEstimates(workspaceSlug: string, projectId: string): Promise<IEstimate[] | undefined> {+ try {+ const { data } = await this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/estimates/`);+ return data || undefined;+ } catch (error) {+ throw error;+ }+ }++ async fetchEstimateById(+ workspaceSlug: string,+ projectId: string,+ estimateId: string+ ): Promise<IEstimate | undefined> {+ try {+ const { data } = await this.get(+ `/api/workspaces/${workspaceSlug}/projects/${projectId}/estimates/${estimateId}/`+ );+ return data || undefined;+ } catch (error) {+ throw error;+ }+ }++ async createEstimate(+ workspaceSlug: string,+ projectId: string,+ payload: IEstimateFormData+ ): Promise<IEstimate | undefined> {+ try {+ const { data } = await this.post(`/api/workspaces/${workspaceSlug}/projects/${projectId}/estimates/`, payload);+ return data || undefined;+ } catch (error) {+ throw error;+ }+ }++ async updateEstimate(+ workspaceSlug: string,+ projectId: string,+ estimateId: string,+ payload: Partial<IEstimateFormData>+ ): Promise<IEstimate | undefined> {+ try {+ const { data } = await this.patch(+ `/api/workspaces/${workspaceSlug}/projects/${projectId}/estimates/${estimateId}/`,+ payload+ );+ return data || undefined;+ } catch (error) {+ throw error;+ }+ }++ async deleteEstimate(workspaceSlug: string, projectId: string, estimateId: string): Promise<void> {+ try {+ await this.delete(`/api/workspaces/${workspaceSlug}/projects/${projectId}/estimates/${estimateId}/`);+ } catch (error) {+ throw error;+ }+ }++ async createEstimatePoint(+ workspaceSlug: string,+ projectId: string,+ estimateId: string,+ payload: Partial<IEstimatePoint>+ ): Promise<IEstimatePoint | undefined> {+ try {+ const { data } = await this.post(+ `/api/workspaces/${workspaceSlug}/projects/${projectId}/estimates/${estimateId}/estimate-points/`,+ payload+ );+ return data || undefined;+ } catch (error) {+ throw error;+ }+ }++ async updateEstimatePoint(+ workspaceSlug: string,+ projectId: string,+ estimateId: string,+ estimatePointId: string,+ payload: Partial<IEstimatePoint>+ ): Promise<IEstimatePoint | undefined> {+ try {+ const { data } = await this.patch(+ `/api/workspaces/${workspaceSlug}/projects/${projectId}/estimates/${estimateId}/estimate-points/${estimatePointId}/`,+ payload+ );+ return data || undefined;+ } catch (error) {+ throw error;+ }+ }++ async removeEstimatePoint(+ workspaceSlug: string,+ projectId: string,+ estimateId: string,+ estimatePointId: string,+ params?: { new_estimate_id: string | undefined }+ ): Promise<IEstimatePoint[] | undefined> {+ return this.delete(+ `/api/workspaces/${workspaceSlug}/projects/${projectId}/estimates/${estimateId}/estimate-points/${estimatePointId}/`,+ params+ )+ .then((response) => response?.data)+ .catch((error) => {+ throw error?.response?.data;+ });+ }+}+const estimateService = new EstimateService();++export default estimateService;diff --git a/web/services/project/index.ts b/web/services/project/index.tsindex d131ceb6b5..73121627c6 100644--- a/web/services/project/index.ts+++ b/web/services/project/index.ts@@ -1,5 +1,5 @@export * from "./project.service";-export * from "./project-estimate.service";+export * from "./estimate.service";export * from "./project-export.service";export * from "./project-member.service";export * from "./project-state.service";diff --git a/web/services/project/project-estimate.service.ts b/web/services/project/project-estimate.service.tsdeleted file mode 100644index f15ae48374..0000000000--- a/web/services/project/project-estimate.service.ts+++ /dev/null@@ -1,72 +0,0 @@-// services-import { API_BASE_URL } from "@/helpers/common.helper";-import { APIService } from "@/services/api.service";-// types-import type { IEstimate, IEstimateFormData, IEstimatePoint } from "@plane/types";-// helpers--export class ProjectEstimateService extends APIService {- constructor() {- super(API_BASE_URL);- }-- async createEstimate(- workspaceSlug: string,- projectId: string,- data: IEstimateFormData- ): Promise<{- estimate: IEstimate;- estimate_points: IEstimatePoint[];- }> {- return this.post(`/api/workspaces/${workspaceSlug}/projects/${projectId}/estimates/`, data)- .then((response) => response?.data)- .catch((error) => {- throw error?.response;- });- }-- async patchEstimate(- workspaceSlug: string,- projectId: string,- estimateId: string,- data: IEstimateFormData- ): Promise<any> {- return this.patch(`/api/workspaces/${workspaceSlug}/projects/${projectId}/estimates/${estimateId}/`, data)- .then((response) => response?.data)- .catch((error) => {- throw error?.response?.data;- });- }-- async getEstimateDetails(workspaceSlug: string, projectId: string, estimateId: string): Promise<IEstimate> {- return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/estimates/${estimateId}/`)- .then((response) => response?.data)- .catch((error) => {- throw error?.response?.data;- });- }-- async getEstimatesList(workspaceSlug: string, projectId: string): Promise<IEstimate[]> {- return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/estimates/`)- .then((response) => response?.data)- .catch((error) => {- throw error?.response?.data;- });- }-- async deleteEstimate(workspaceSlug: string, projectId: string, estimateId: string): Promise<any> {- return this.delete(`/api/workspaces/${workspaceSlug}/projects/${projectId}/estimates/${estimateId}/`)- .then((response) => response?.data)- .catch((error) => {- throw error?.response?.data;- });- }-- async getWorkspaceEstimatesList(workspaceSlug: string): Promise<IEstimate[]> {- return this.get(`/api/workspaces/${workspaceSlug}/estimates/`)- .then((response) => response?.data)- .catch((error) => {- throw error?.response?.data;- });- }-}diff --git a/web/services/project/project-publish.service.ts b/web/services/project/project-publish.service.tsindex 7ae3cdeca6..b0e3ca6860 100644--- a/web/services/project/project-publish.service.ts+++ b/web/services/project/project-publish.service.ts@@ -1,42 +1,43 @@+// types+import { TPublishSettings } from "@plane/types";+// helpersimport { API_BASE_URL } from "@/helpers/common.helper";// servicesimport { APIService } from "@/services/api.service";-// types-import { IProjectPublishSettings } from "@/store/project/project-publish.store";export class ProjectPublishService extends APIService {constructor() {super(API_BASE_URL);}- async getProjectSettingsAsync(workspace_slug: string, project_slug: string): Promise<any> {- return this.get(`/api/workspaces/${workspace_slug}/projects/${project_slug}/project-deploy-boards/`)+ async fetchPublishSettings(workspaceSlug: string, projectID: string): Promise<TPublishSettings> {+ return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectID}/project-deploy-boards/`).then((response) => response?.data).catch((error) => {throw error?.response;});}- async createProjectSettingsAsync(- workspace_slug: string,- project_slug: string,- data: IProjectPublishSettings- ): Promise<any> {- return this.post(`/api/workspaces/${workspace_slug}/projects/${project_slug}/project-deploy-boards/`, data)+ async publishProject(+ workspaceSlug: string,+ projectID: string,+ data: Partial<TPublishSettings>+ ): Promise<TPublishSettings> {+ return this.post(`/api/workspaces/${workspaceSlug}/projects/${projectID}/project-deploy-boards/`, data).then((response) => response?.data).catch((error) => {throw error?.response;});}- async updateProjectSettingsAsync(- workspace_slug: string,- project_slug: string,+ async updatePublishSettings(+ workspaceSlug: string,+ projectID: string,project_publish_id: string,- data: IProjectPublishSettings- ): Promise<any> {+ data: Partial<TPublishSettings>+ ): Promise<TPublishSettings> {return this.patch(- `/api/workspaces/${workspace_slug}/projects/${project_slug}/project-deploy-boards/${project_publish_id}/`,+ `/api/workspaces/${workspaceSlug}/projects/${projectID}/project-deploy-boards/${project_publish_id}/`,data).then((response) => response?.data)@@ -45,13 +46,9 @@ export class ProjectPublishService extends APIService {});}- async deleteProjectSettingsAsync(- workspace_slug: string,- project_slug: string,- project_publish_id: string- ): Promise<any> {+ async unpublishProject(workspaceSlug: string, projectID: string, project_publish_id: string): Promise<any> {return this.delete(- `/api/workspaces/${workspace_slug}/projects/${project_slug}/project-deploy-boards/${project_publish_id}/`+ `/api/workspaces/${workspaceSlug}/projects/${projectID}/project-deploy-boards/${project_publish_id}/`).then((response) => response?.data).catch((error) => {diff --git a/web/store/estimate.store.ts b/web/store/estimate.store.tsdeleted file mode 100644index 0bb35a23b0..0000000000--- a/web/store/estimate.store.ts+++ /dev/null@@ -1,222 +0,0 @@-import set from "lodash/set";-import { observable, action, makeObservable, runInAction, computed } from "mobx";-import { computedFn } from "mobx-utils";-// types-import { IEstimate, IEstimateFormData } from "@plane/types";-// services-import { ProjectEstimateService } from "@/services/project";-// store-import { RootStore } from "@/store/root.store";--export interface IEstimateStore {- //Loaders- fetchedMap: Record<string, boolean>;- // observables- estimateMap: Record<string, IEstimate>;- // computed- areEstimatesEnabledForCurrentProject: boolean;- projectEstimates: IEstimate[] | null;- activeEstimateDetails: IEstimate | null;- // computed actions- areEstimatesEnabledForProject: (projectId: string) => boolean;- getEstimatePointValue: (estimateKey: number | null, projectId: string | null) => string;- getProjectEstimateById: (estimateId: string) => IEstimate | null;- getProjectActiveEstimateDetails: (projectId: string) => IEstimate | null;- // fetch actions- fetchProjectEstimates: (workspaceSlug: string, projectId: string) => Promise<IEstimate[]>;- fetchWorkspaceEstimates: (workspaceSlug: string) => Promise<IEstimate[]>;- // crud actions- createEstimate: (workspaceSlug: string, projectId: string, data: IEstimateFormData) => Promise<IEstimate>;- updateEstimate: (- workspaceSlug: string,- projectId: string,- estimateId: string,- data: IEstimateFormData- ) => Promise<IEstimate>;- deleteEstimate: (workspaceSlug: string, projectId: string, estimateId: string) => Promise<void>;-}--export class EstimateStore implements IEstimateStore {- // observables- estimateMap: Record<string, IEstimate> = {};- //loaders- fetchedMap: Record<string, boolean> = {};- // root store- rootStore;- // services- estimateService;-- constructor(_rootStore: RootStore) {- makeObservable(this, {- // observables- estimateMap: observable,- fetchedMap: observable,- // computed- areEstimatesEnabledForCurrentProject: computed,- projectEstimates: computed,- activeEstimateDetails: computed,- // actions- fetchProjectEstimates: action,- fetchWorkspaceEstimates: action,- createEstimate: action,- updateEstimate: action,- deleteEstimate: action,- });-- // root store- this.rootStore = _rootStore;- // services- this.estimateService = new ProjectEstimateService();- }-- /**- * @description returns true if estimates are enabled for current project, false otherwise- */- get areEstimatesEnabledForCurrentProject() {- const currentProjectDetails = this.rootStore.projectRoot.project.currentProjectDetails;- if (!currentProjectDetails) return false;- return Boolean(currentProjectDetails?.estimate);- }-- /**- * @description returns the list of estimates for current project- */- get projectEstimates() {- const projectId = this.rootStore.router.projectId;- const worksapceSlug = this.rootStore.router.workspaceSlug || "";- if (!projectId || !(this.fetchedMap[projectId] || this.fetchedMap[worksapceSlug])) return null;- return Object.values(this.estimateMap).filter((estimate) => estimate.project === projectId);- }-- /**- * @description returns the active estimate details for current project- */- get activeEstimateDetails() {- const currentProjectDetails = this.rootStore.projectRoot.project.currentProjectDetails;- if (!currentProjectDetails || !currentProjectDetails?.estimate) return null;- return this.estimateMap?.[currentProjectDetails?.estimate || ""] || null;- }-- /**- * @description returns true if estimates are enabled for a project using project id- * @param projectId- */- areEstimatesEnabledForProject = computedFn((projectId: string) => {- const projectDetails = this.rootStore.projectRoot.project.getProjectById(projectId);- if (!projectDetails) return false;- return Boolean(projectDetails.estimate) ?? false;- });-- /**- * @description returns the point value for the given estimate key to display in the UI- */- getEstimatePointValue = computedFn((estimateKey: number | null, projectId: string | null) => {- if (estimateKey === null) return "None";- const activeEstimate = projectId ? this.getProjectActiveEstimateDetails(projectId) : this.activeEstimateDetails;- return activeEstimate?.points?.find((point) => point.key === estimateKey)?.value || "None";- });-- /**- * @description returns the estimate details for the given estimate id- * @param estimateId- */- getProjectEstimateById = computedFn((estimateId: string) => {- if (!this.projectEstimates) return null;- const estimateInfo = this.estimateMap?.[estimateId] || null;- return estimateInfo;- });-- /**- * @description returns the estimate details for the given estimate id- * @param projectId- */- getProjectActiveEstimateDetails = computedFn((projectId: string) => {- const projectDetails = this.rootStore.projectRoot.project?.getProjectById(projectId);- const worksapceSlug = this.rootStore.router.workspaceSlug || "";- if (!projectDetails || !projectDetails?.estimate || !(this.fetchedMap[projectId] || this.fetchedMap[worksapceSlug]))- return null;- return this.estimateMap?.[projectDetails?.estimate || ""] || null;- });-- /**- * @description fetches the list of estimates for the given project- * @param workspaceSlug- * @param projectId- */- fetchProjectEstimates = async (workspaceSlug: string, projectId: string) =>- await this.estimateService.getEstimatesList(workspaceSlug, projectId).then((response) => {- runInAction(() => {- response.forEach((estimate) => {- set(this.estimateMap, estimate.id, estimate);- });- this.fetchedMap[projectId] = true;- });- return response;- });-- /**- * @description fetches the list of estimates for the given project- * @param workspaceSlug- * @param projectId- */- fetchWorkspaceEstimates = async (workspaceSlug: string) =>- await this.estimateService.getWorkspaceEstimatesList(workspaceSlug).then((response) => {- runInAction(() => {- response.forEach((estimate) => {- set(this.estimateMap, estimate.id, estimate);- });- this.fetchedMap[workspaceSlug] = true;- });- return response;- });-- /**- * @description creates a new estimate for the given project- * @param workspaceSlug- * @param projectId- * @param data- */- createEstimate = async (workspaceSlug: string, projectId: string, data: IEstimateFormData) =>- await this.estimateService.createEstimate(workspaceSlug, projectId, data).then((response) => {- const responseEstimate = {- ...response.estimate,- points: response.estimate_points,- };- runInAction(() => {- set(this.estimateMap, [responseEstimate.id], responseEstimate);- });- return response.estimate;- });-- /**- * @description updates the given estimate for the given project- * @param workspaceSlug- * @param projectId- * @param estimateId- * @param data- */- updateEstimate = async (workspaceSlug: string, projectId: string, estimateId: string, data: IEstimateFormData) =>- await this.estimateService.patchEstimate(workspaceSlug, projectId, estimateId, data).then((response) => {- runInAction(() => {- set(this.estimateMap, estimateId, {- ...this.estimateMap[estimateId],- ...data.estimate,- points: [...data.estimate_points],- });- });- return response;- });-- /**- * @description deletes the given estimate for the given project- * @param workspaceSlug- * @param projectId- * @param estimateId- */- deleteEstimate = async (workspaceSlug: string, projectId: string, estimateId: string) =>- await this.estimateService.deleteEstimate(workspaceSlug, projectId, estimateId).then(() => {- runInAction(() => {- delete this.estimateMap[estimateId];- });- });-}diff --git a/web/store/estimates/estimate-point.ts b/web/store/estimates/estimate-point.tsnew file mode 100644index 0000000000..3b4bf48b79--- /dev/null+++ b/web/store/estimates/estimate-point.ts@@ -0,0 +1,148 @@+import set from "lodash/set";+import { action, computed, makeObservable, observable, runInAction } from "mobx";+import { IEstimate, IEstimatePoint as IEstimatePointType } from "@plane/types";+// services+import estimateService from "@/services/project/estimate.service";+// store+import { RootStore } from "@/store/root.store";++type TErrorCodes = {+ status: string;+ message?: string;+};++export interface IEstimatePoint extends IEstimatePointType {+ // observables+ error: TErrorCodes | undefined;+ // computed+ asJson: IEstimatePointType;+ // helper actions+ updateEstimatePointObject: (estimatePoint: Partial<IEstimatePointType>) => void;+ // actions+ updateEstimatePoint: (+ workspaceSlug: string,+ projectId: string,+ payload: Partial<IEstimatePointType>+ ) => Promise<IEstimatePointType | undefined>;+}++export class EstimatePoint implements IEstimatePoint {+ // data model observables+ id: string | undefined = undefined;+ key: number | undefined = undefined;+ value: string | undefined = undefined;+ description: string | undefined = undefined;+ workspace: string | undefined = undefined;+ project: string | undefined = undefined;+ estimate: string | undefined = undefined;+ created_at: Date | undefined = undefined;+ updated_at: Date | undefined = undefined;+ created_by: string | undefined = undefined;+ updated_by: string | undefined = undefined;+ // observables+ error: TErrorCodes | undefined = undefined;++ constructor(+ private store: RootStore,+ private projectEstimate: IEstimate,+ private data: IEstimatePointType+ ) {+ makeObservable(this, {+ // data model observables+ id: observable.ref,+ key: observable.ref,+ value: observable.ref,+ description: observable.ref,+ workspace: observable.ref,+ project: observable.ref,+ estimate: observable.ref,+ created_at: observable.ref,+ updated_at: observable.ref,+ created_by: observable.ref,+ updated_by: observable.ref,+ // observables+ error: observable.ref,+ // computed+ asJson: computed,+ // actions+ updateEstimatePoint: action,+ });+ this.id = this.data.id;+ this.key = this.data.key;+ this.value = this.data.value;+ this.description = this.data.description;+ this.workspace = this.data.workspace;+ this.project = this.data.project;+ this.estimate = this.data.estimate;+ this.created_at = this.data.created_at;+ this.updated_at = this.data.updated_at;+ this.created_by = this.data.created_by;+ this.updated_by = this.data.updated_by;+ }++ // computed+ get asJson() {+ return {+ id: this.id,+ key: this.key,+ value: this.value,+ description: this.description,+ workspace: this.workspace,+ project: this.project,+ estimate: this.estimate,+ created_at: this.created_at,+ updated_at: this.updated_at,+ created_by: this.created_by,+ updated_by: this.updated_by,+ };+ }++ // helper actions+ /**+ * @description updating an estimate point object in local store+ * @param { Partial<IEstimatePointType> } estimatePoint+ * @returns { void }+ */+ updateEstimatePointObject = (estimatePoint: Partial<IEstimatePointType>) => {+ Object.keys(estimatePoint).map((key) => {+ const estimatePointKey = key as keyof IEstimatePointType;+ set(this, estimatePointKey, estimatePoint[estimatePointKey]);+ });+ };++ // actions+ /**+ * @description updating an estimate point+ * @param { Partial<IEstimatePointType> } payload+ * @returns { IEstimatePointType | undefined }+ */+ updateEstimatePoint = async (+ workspaceSlug: string,+ projectId: string,+ payload: Partial<IEstimatePointType>+ ): Promise<IEstimatePointType | undefined> => {+ try {+ if (!this.projectEstimate?.id || !this.id || !payload) return undefined;++ const estimatePoint = await estimateService.updateEstimatePoint(+ workspaceSlug,+ projectId,+ this.projectEstimate?.id,+ this.id,+ payload+ );+ if (estimatePoint) {+ runInAction(() => {+ Object.keys(payload).map((key) => {+ const estimatePointKey = key as keyof IEstimatePointType;+ set(this, estimatePointKey, estimatePoint[estimatePointKey]);+ });+ });+ }++ return estimatePoint;+ } catch (error) {+ throw error;+ }+ };+}diff --git a/web/store/estimates/estimate.ts b/web/store/estimates/estimate.tsnew file mode 100644index 0000000000..8417386c99--- /dev/null+++ b/web/store/estimates/estimate.ts@@ -0,0 +1,292 @@+import orderBy from "lodash/orderBy";+import set from "lodash/set";+import unset from "lodash/unset";+import { action, computed, makeObservable, observable, runInAction } from "mobx";+import { computedFn } from "mobx-utils";+import {+ IEstimate as IEstimateType,+ IEstimatePoint as IEstimatePointType,+ TEstimateSystemKeys,+ IEstimateFormData,+ TEstimatePointsObject,+} from "@plane/types";+// services+import estimateService from "@/services/project/estimate.service";+// store+import { IEstimatePoint, EstimatePoint } from "@/store/estimates/estimate-point";+import { RootStore } from "@/store/root.store";++type TErrorCodes = {+ status: string;+ message?: string;+};++export interface IEstimate extends Omit<IEstimateType, "points"> {+ // observables+ error: TErrorCodes | undefined;+ estimatePoints: Record<string, IEstimatePoint>;+ // computed+ asJson: Omit<IEstimateType, "points">;+ estimatePointIds: string[] | undefined;+ estimatePointById: (estimatePointId: string) => IEstimatePointType | undefined;+ // actions+ updateEstimateSortOrder: (+ workspaceSlug: string,+ projectId: string,+ payload: TEstimatePointsObject[]+ ) => Promise<IEstimateType | undefined>;+ updateEstimateSwitch: (+ workspaceSlug: string,+ projectId: string,+ payload: IEstimateFormData+ ) => Promise<IEstimateType | undefined>;+ creteEstimatePoint: (+ workspaceSlug: string,+ projectId: string,+ payload: Partial<IEstimatePointType>+ ) => Promise<IEstimatePointType | undefined>;+ deleteEstimatePoint: (+ workspaceSlug: string,+ projectId: string,+ estimatePointId: string,+ newEstimatePointId: string | undefined+ ) => Promise<IEstimatePointType[] | undefined>;+}++export class Estimate implements IEstimate {+ // data model observables+ id: string | undefined = undefined;+ name: string | undefined = undefined;+ description: string | undefined = undefined;+ type: TEstimateSystemKeys | undefined = undefined;+ workspace: string | undefined = undefined;+ project: string | undefined = undefined;+ last_used: boolean | undefined = undefined;+ created_at: Date | undefined = undefined;+ updated_at: Date | undefined = undefined;+ created_by: string | undefined = undefined;+ updated_by: string | undefined = undefined;+ // observables+ error: TErrorCodes | undefined = undefined;+ estimatePoints: Record<string, IEstimatePoint> = {};++ constructor(+ private store: RootStore,+ private data: IEstimateType+ ) {+ makeObservable(this, {+ // data model observables+ id: observable.ref,+ name: observable.ref,+ description: observable.ref,+ type: observable.ref,+ workspace: observable.ref,+ project: observable.ref,+ last_used: observable.ref,+ created_at: observable.ref,+ updated_at: observable.ref,+ created_by: observable.ref,+ updated_by: observable.ref,+ // observables+ error: observable.ref,+ estimatePoints: observable,+ // computed+ asJson: computed,+ estimatePointIds: computed,+ // actions+ updateEstimateSortOrder: action,+ updateEstimateSwitch: action,+ creteEstimatePoint: action,+ deleteEstimatePoint: action,+ });+ this.id = this.data.id;+ this.name = this.data.name;+ this.description = this.data.description;+ this.type = this.data.type;+ this.workspace = this.data.workspace;+ this.project = this.data.project;+ this.last_used = this.data.last_used;+ this.created_at = this.data.created_at;+ this.updated_at = this.data.updated_at;+ this.created_by = this.data.created_by;+ this.updated_by = this.data.updated_by;+ this.data.points?.forEach((estimationPoint) => {+ if (estimationPoint.id)+ set(this.estimatePoints, [estimationPoint.id], new EstimatePoint(this.store, this.data, estimationPoint));+ });+ }++ // computed+ get asJson() {+ return {+ id: this.id,+ name: this.name,+ description: this.description,+ type: this.type,+ workspace: this.workspace,+ project: this.project,+ last_used: this.last_used,+ created_at: this.created_at,+ updated_at: this.updated_at,+ created_by: this.created_by,+ updated_by: this.updated_by,+ };+ }++ get estimatePointIds() {+ const { estimatePoints } = this;+ if (!estimatePoints) return undefined;+ let currentEstimatePoints = Object.values(estimatePoints).filter(+ (estimatePoint) => estimatePoint?.estimate === this.id+ );+ currentEstimatePoints = orderBy(currentEstimatePoints, ["key"], "asc");+ const estimatePointIds = currentEstimatePoints.map((estimatePoint) => estimatePoint.id) as string[];+ return estimatePointIds ?? undefined;+ }++ estimatePointById = computedFn((estimatePointId: string) => {+ if (!estimatePointId) return undefined;+ return this.estimatePoints[estimatePointId] ?? undefined;+ });++ // actions+ /**+ * @description update an estimate sort order+ * @param { string } workspaceSlug+ * @param { string } projectId+ * @param { TEstimatePointsObject[] } payload+ * @returns { IEstimateType | undefined }+ */+ updateEstimateSortOrder = async (+ workspaceSlug: string,+ projectId: string,+ payload: TEstimatePointsObject[]+ ): Promise<IEstimateType | undefined> => {+ try {+ if (!this.id || !payload) return;++ const estimate = await estimateService.updateEstimate(workspaceSlug, projectId, this.id, {+ estimate_points: payload,+ });+ runInAction(() => {+ estimate?.points &&+ estimate?.points.map((estimatePoint) => {+ if (estimatePoint.id)+ set(this.estimatePoints, [estimatePoint.id], new EstimatePoint(this.store, this.data, estimatePoint));+ });+ });++ return estimate;+ } catch (error) {+ throw error;+ }+ };++ /**+ * @description update an estimate sort order+ * @param { string } workspaceSlug+ * @param { string } projectId+ * @param { IEstimateFormData} payload+ * @returns { IEstimateType | undefined }+ */+ updateEstimateSwitch = async (+ workspaceSlug: string,+ projectId: string,+ payload: IEstimateFormData+ ): Promise<IEstimateType | undefined> => {+ try {+ if (!this.id || !payload) return;++ const estimate = await estimateService.updateEstimate(workspaceSlug, projectId, this.id, payload);+ if (estimate) {+ runInAction(() => {+ this.name = estimate?.name;+ this.type = estimate?.type;+ estimate?.points &&+ estimate?.points.map((estimatePoint) => {+ if (estimatePoint.id)+ this.estimatePoints?.[estimatePoint.id]?.updateEstimatePointObject({+ key: estimatePoint.key,+ value: estimatePoint.value,+ });+ });+ });+ }++ return estimate;+ } catch (error) {+ throw error;+ }+ };++ /**+ * @description create an estimate point+ * @param { string } workspaceSlug+ * @param { string } projectId+ * @param { Partial<IEstimatePointType> } payload+ * @returns { IEstimatePointType | undefined }+ */+ creteEstimatePoint = async (+ workspaceSlug: string,+ projectId: string,+ payload: Partial<IEstimatePointType>+ ): Promise<IEstimatePointType | undefined> => {+ try {+ if (!this.id || !payload) return;++ const estimatePoint = await estimateService.createEstimatePoint(workspaceSlug, projectId, this.id, payload);+ if (estimatePoint) {+ runInAction(() => {+ if (estimatePoint.id) {+ set(this.estimatePoints, [estimatePoint.id], new EstimatePoint(this.store, this.data, estimatePoint));+ }+ });+ }+ } catch (error) {+ throw error;+ }+ };++ /**+ * @description delete an estimate point+ * @param { string } workspaceSlug+ * @param { string } projectId+ * @param { string } estimatePointId+ * @param { string | undefined } newEstimatePointId+ * @returns { void }+ */+ deleteEstimatePoint = async (+ workspaceSlug: string,+ projectId: string,+ estimatePointId: string,+ newEstimatePointId: string | undefined+ ): Promise<IEstimatePointType[] | undefined> => {+ try {+ if (!this.id) return;++ const deleteEstimatePoint = await estimateService.removeEstimatePoint(+ workspaceSlug,+ projectId,+ this.id,+ estimatePointId,+ newEstimatePointId ? { new_estimate_id: newEstimatePointId } : undefined+ );++ runInAction(() => {+ unset(this.estimatePoints, [estimatePointId]);+ });+ if (deleteEstimatePoint && deleteEstimatePoint.length > 0) {+ runInAction(() => {+ deleteEstimatePoint.map((estimatePoint) => {+ if (estimatePoint.id)+ set(this.estimatePoints, [estimatePoint.id], new EstimatePoint(this.store, this.data, estimatePoint));+ });+ });+ }++ return deleteEstimatePoint;+ } catch (error) {+ throw error;+ }+ };+}diff --git a/web/store/estimates/project-estimate.store.ts b/web/store/estimates/project-estimate.store.tsnew file mode 100644index 0000000000..1ac77dce32--- /dev/null+++ b/web/store/estimates/project-estimate.store.ts@@ -0,0 +1,292 @@+import orderBy from "lodash/orderBy";+import set from "lodash/set";+import unset from "lodash/unset";+import update from "lodash/update";+import { action, computed, makeObservable, observable, runInAction } from "mobx";+import { computedFn } from "mobx-utils";+import { IEstimate as IEstimateType, IEstimateFormData } from "@plane/types";+// services+import estimateService from "@/services/project/estimate.service";+// store+import { IEstimate, Estimate } from "@/store/estimates/estimate";+import { RootStore } from "@/store/root.store";++type TEstimateLoader = "init-loader" | "mutation-loader" | undefined;+type TErrorCodes = {+ status: string;+ message?: string;+};++export interface IProjectEstimateStore {+ // observables+ loader: TEstimateLoader;+ estimates: Record<string, IEstimate>;+ error: TErrorCodes | undefined;+ // computed+ currentActiveEstimateId: string | undefined;+ archivedEstimateIds: string[] | undefined;+ areEstimateEnabledByProjectId: (projectId: string) => boolean;+ estimateIdsByProjectId: (projectId: string) => string[] | undefined;+ estimateById: (estimateId: string) => IEstimate | undefined;+ // actions+ getWorkspaceEstimates: (workspaceSlug: string, loader?: TEstimateLoader) => Promise<IEstimateType[] | undefined>;+ getProjectEstimates: (+ workspaceSlug: string,+ projectId: string,+ loader?: TEstimateLoader+ ) => Promise<IEstimateType[] | undefined>;+ getEstimateById: (workspaceSlug: string, projectId: string, estimateId: string) => Promise<IEstimateType | undefined>;+ createEstimate: (+ workspaceSlug: string,+ projectId: string,+ data: IEstimateFormData+ ) => Promise<IEstimateType | undefined>;+ deleteEstimate: (workspaceSlug: string, projectId: string, estimateId: string) => Promise<void>;+}++export class ProjectEstimateStore implements IProjectEstimateStore {+ // observables+ loader: TEstimateLoader = undefined;+ estimates: Record<string, IEstimate> = {}; // estimate_id -> estimate+ error: TErrorCodes | undefined = undefined;++ constructor(private store: RootStore) {+ makeObservable(this, {+ // observables+ loader: observable.ref,+ estimates: observable,+ error: observable,+ // computed+ currentActiveEstimateId: computed,+ archivedEstimateIds: computed,+ // actions+ getWorkspaceEstimates: action,+ getProjectEstimates: action,+ getEstimateById: action,+ createEstimate: action,+ deleteEstimate: action,+ });+ }++ // computed+ /**+ * @description get current active estimate id for a project+ * @returns { string | undefined }+ */+ get currentActiveEstimateId(): string | undefined {+ const { projectId } = this.store.router;+ if (!projectId) return undefined;+ const currentActiveEstimateId = Object.values(this.estimates || {}).find(+ (p) => p.project === projectId && p.last_used+ );+ return currentActiveEstimateId?.id ?? undefined;+ }++ /**+ * @description get all archived estimate ids for a project+ * @returns { string[] | undefined }+ */+ get archivedEstimateIds(): string[] | undefined {+ const { projectId } = this.store.router;+ if (!projectId) return undefined;+ const archivedEstimates = orderBy(+ Object.values(this.estimates || {}).filter((p) => p.project === projectId && !p.last_used),+ ["created_at"],+ "desc"+ );+ const archivedEstimateIds = archivedEstimates.map((p) => p.id) as string[];+ return archivedEstimateIds ?? undefined;+ }++ /**+ * @description get estimates are enabled in the project or not+ * @returns { boolean }+ */+ areEstimateEnabledByProjectId = computedFn((projectId: string) => {+ if (!projectId) return false;+ const projectDetails = this.store.projectRoot.project.getProjectById(projectId);+ if (!projectDetails) return false;+ return Boolean(projectDetails.estimate) || false;+ });++ /**+ * @description get all estimate ids for a project+ * @returns { string[] | undefined }+ */+ estimateIdsByProjectId = computedFn((projectId: string) => {+ if (!projectId) return undefined;+ const projectEstimatesIds = Object.values(this.estimates || {})+ .filter((p) => p.project === projectId)+ .map((p) => p.id) as string[];+ return projectEstimatesIds ?? undefined;+ });++ /**+ * @description get estimate by id+ * @returns { IEstimate | undefined }+ */+ estimateById = computedFn((estimateId: string) => {+ if (!estimateId) return undefined;+ return this.estimates[estimateId] ?? undefined;+ });++ // actions+ /**+ * @description fetch all estimates for a workspace+ * @param { string } workspaceSlug+ * @returns { IEstimateType[] | undefined }+ */+ getWorkspaceEstimates = async (+ workspaceSlug: string,+ loader: TEstimateLoader = "mutation-loader"+ ): Promise<IEstimateType[] | undefined> => {+ try {+ this.error = undefined;+ if (Object.keys(this.estimates || {}).length <= 0) this.loader = loader ? loader : "init-loader";++ const estimates = await estimateService.fetchWorkspaceEstimates(workspaceSlug);+ if (estimates && estimates.length > 0) {+ runInAction(() => {+ estimates.forEach((estimate) => {+ if (estimate.id) set(this.estimates, [estimate.id], new Estimate(this.store, estimate));+ });+ });+ }++ return estimates;+ } catch (error) {+ this.loader = undefined;+ this.error = {+ status: "error",+ message: "Error fetching estimates",+ };+ throw error;+ }+ };++ /**+ * @description fetch all estimates for a project+ * @param { string } workspaceSlug+ * @param { string } projectId+ * @returns { IEstimateType[] | undefined }+ */+ getProjectEstimates = async (+ workspaceSlug: string,+ projectId: string,+ loader: TEstimateLoader = "mutation-loader"+ ): Promise<IEstimateType[] | undefined> => {+ try {+ this.error = undefined;+ if (!this.estimateIdsByProjectId(projectId)) this.loader = loader ? loader : "init-loader";++ const estimates = await estimateService.fetchProjectEstimates(workspaceSlug, projectId);+ if (estimates && estimates.length > 0) {+ runInAction(() => {+ estimates.forEach((estimate) => {+ if (estimate.id) set(this.estimates, [estimate.id], new Estimate(this.store, estimate));+ });+ });+ }++ return estimates;+ } catch (error) {+ this.loader = undefined;+ this.error = {+ status: "error",+ message: "Error fetching estimates",+ };+ throw error;+ }+ };++ /**+ * @description update an estimate for a project+ * @param { string } workspaceSlug+ * @param { string } projectId+ * @param { string } estimateId+ * @returns IEstimateType | undefined+ */+ getEstimateById = async (+ workspaceSlug: string,+ projectId: string,+ estimateId: string+ ): Promise<IEstimateType | undefined> => {+ try {+ this.error = undefined;++ const estimate = await estimateService.fetchEstimateById(workspaceSlug, projectId, estimateId);+ if (estimate) {+ runInAction(() => {+ if (estimate.id)+ update(this.estimates, [estimate.id], (estimateStore) => {+ if (estimateStore) estimateStore.updateEstimate(estimate);+ else return new Estimate(this.store, estimate);+ });+ });+ }++ return estimate;+ } catch (error) {+ this.error = {+ status: "error",+ message: "Error fetching estimate by id",+ };+ throw error;+ }+ };++ /**+ * @description create an estimate for a project+ * @param { string } workspaceSlug+ * @param { string } projectId+ * @param { Partial<IEstimateFormData> } payload+ * @returns+ */+ createEstimate = async (+ workspaceSlug: string,+ projectId: string,+ payload: IEstimateFormData+ ): Promise<IEstimateType | undefined> => {+ try {+ this.error = undefined;++ const estimate = await estimateService.createEstimate(workspaceSlug, projectId, payload);+ if (estimate) {+ // update estimate_id in current project+ // await this.store.projectRoot.project.updateProject(workspaceSlug, projectId, {+ // estimate: estimate.id,+ // });+ runInAction(() => {+ if (estimate.id) set(this.estimates, [estimate.id], new Estimate(this.store, estimate));+ });+ }++ return estimate;+ } catch (error) {+ this.error = {+ status: "error",+ message: "Error creating estimate",+ };+ throw error;+ }+ };++ /**+ * @description delete the estimate for a project+ * @param workspaceSlug+ * @param projectId+ * @param estimateId+ */+ deleteEstimate = async (workspaceSlug: string, projectId: string, estimateId: string) => {+ try {+ await estimateService.deleteEstimate(workspaceSlug, projectId, estimateId);+ runInAction(() => estimateId && unset(this.estimates, [estimateId]));+ } catch (error) {+ this.error = {+ status: "error",+ message: "Error deleting estimate",+ };+ throw error;+ }+ };+}diff --git a/web/store/issue/issue-details/activity.store.ts b/web/store/issue/issue-details/activity.store.tsindex 562f8ef5ba..dd4fe10aa2 100644--- a/web/store/issue/issue-details/activity.store.ts+++ b/web/store/issue/issue-details/activity.store.ts@@ -4,10 +4,10 @@ import sortBy from "lodash/sortBy";import uniq from "lodash/uniq";import update from "lodash/update";import { action, makeObservable, observable, runInAction } from "mobx";+import { TIssueActivityComment, TIssueActivity, TIssueActivityMap, TIssueActivityIdMap } from "@plane/types";// servicesimport { IssueActivityService } from "@/services/issue";// types-import { TIssueActivityComment, TIssueActivity, TIssueActivityMap, TIssueActivityIdMap } from "@plane/types";import { IIssueDetail } from "./root.store";export type TActivityLoader = "fetch" | "mutate" | undefined;@@ -117,10 +117,10 @@ export class IssueActivityStore implements IIssueActivityStore {this.loader = loaderType;let props = {};- const _activityIds = this.getActivitiesByIssueId(issueId);- if (_activityIds && _activityIds.length > 0) {- const _activity = this.getActivityById(_activityIds[_activityIds.length - 1]);- if (_activity) props = { created_at__gt: _activity.created_at };+ const currentActivityIds = this.getActivitiesByIssueId(issueId);+ if (currentActivityIds && currentActivityIds.length > 0) {+ const currentActivity = this.getActivityById(currentActivityIds[currentActivityIds.length - 1]);+ if (currentActivity) props = { created_at__gt: currentActivity.created_at };}const activities = await this.issueActivityService.getIssueActivities(workspaceSlug, projectId, issueId, props);@@ -128,9 +128,9 @@ export class IssueActivityStore implements IIssueActivityStore {const activityIds = activities.map((activity) => activity.id);runInAction(() => {- update(this.activities, issueId, (_activityIds) => {- if (!_activityIds) return activityIds;- return uniq(concat(_activityIds, activityIds));+ update(this.activities, issueId, (currentActivityIds) => {+ if (!currentActivityIds) return activityIds;+ return uniq(concat(currentActivityIds, activityIds));});activities.forEach((activity) => {set(this.activityMap, activity.id, activity);diff --git a/web/store/issue/issue-details/sub_issues.store.ts b/web/store/issue/issue-details/sub_issues.store.tsindex bb1cf922cc..b43e4d487b 100644--- a/web/store/issue/issue-details/sub_issues.store.ts+++ b/web/store/issue/issue-details/sub_issues.store.ts@@ -346,7 +346,10 @@ export class IssueSubIssuesStore implements IIssueSubIssuesStore {// fetching other project modulesthis.rootIssueDetailStore.rootIssueStore.rootStore.module.fetchModules(workspaceSlug, projectId);// fetching other project estimates- this.rootIssueDetailStore.rootIssueStore.rootStore.estimate.fetchProjectEstimates(workspaceSlug, projectId);+ this.rootIssueDetailStore.rootIssueStore.rootStore.projectEstimate.getProjectEstimates(+ workspaceSlug,+ projectId+ );}}} catch (error) {diff --git a/web/store/project/project-publish.store.ts b/web/store/project/project-publish.store.tsindex 230090d98f..4e08fd6c67 100644--- a/web/store/project/project-publish.store.ts+++ b/web/store/project/project-publish.store.ts@@ -1,52 +1,43 @@import set from "lodash/set";+import unset from "lodash/unset";import { observable, action, makeObservable, runInAction } from "mobx";// types-import { ProjectPublishService } from "@/services/project";-import { ProjectRootStore } from "./";+import { TPublishSettings } from "@plane/types";// services--export type TProjectPublishViews = "list" | "gantt" | "kanban" | "calendar" | "spreadsheet";--export type TProjectPublishViewsSettings = {- [key in TProjectPublishViews]: boolean;-};--export interface IProjectPublishSettings {- id?: string;- project?: string;- comments: boolean;- reactions: boolean;- votes: boolean;- views: TProjectPublishViewsSettings;- inbox: string | null;-}+import { ProjectPublishService } from "@/services/project";+// store+import { ProjectRootStore } from "@/store/project";export interface IProjectPublishStore {// statesgeneralLoader: boolean;fetchSettingsLoader: boolean;// observables- projectPublishSettings: IProjectPublishSettings | "not-initialized";- // project settings actions- getProjectSettingsAsync: (workspaceSlug: string, projectId: string) => Promise<void>;- updateProjectSettingsAsync: (+ publishSettingsMap: Record<string, TPublishSettings>; // projectID => TPublishSettings+ // helpers+ getPublishSettingsByProjectID: (projectID: string) => TPublishSettings | undefined;+ // actions+ fetchPublishSettings: (workspaceSlug: string, projectID: string) => Promise<TPublishSettings>;+ updatePublishSettings: (workspaceSlug: string,- projectId: string,+ projectID: string,projectPublishId: string,- data: IProjectPublishSettings- ) => Promise<void>;- // project publish actions- publishProject: (workspaceSlug: string, projectId: string, data: IProjectPublishSettings) => Promise<void>;- unPublishProject: (workspaceSlug: string, projectId: string, projectPublishId: string) => Promise<void>;+ data: Partial<TPublishSettings>+ ) => Promise<TPublishSettings>;+ publishProject: (+ workspaceSlug: string,+ projectID: string,+ data: Partial<TPublishSettings>+ ) => Promise<TPublishSettings>;+ unPublishProject: (workspaceSlug: string, projectID: string, projectPublishId: string) => Promise<void>;}export class ProjectPublishStore implements IProjectPublishStore {// statesgeneralLoader: boolean = false;fetchSettingsLoader: boolean = false;- // actions- project_id: string | null = null;- projectPublishSettings: IProjectPublishSettings | "not-initialized" = "not-initialized";+ // observables+ publishSettingsMap: Record<string, TPublishSettings> = {};// root storeprojectRootStore: ProjectRootStore;// services@@ -58,12 +49,10 @@ export class ProjectPublishStore implements IProjectPublishStore {generalLoader: observable.ref,fetchSettingsLoader: observable.ref,// observables- project_id: observable.ref,- projectPublishSettings: observable.ref,- // project settings actions- getProjectSettingsAsync: action,- updateProjectSettingsAsync: action,- // project publish actions+ publishSettingsMap: observable,+ // actions+ fetchPublishSettings: action,+ updatePublishSettings: action,publishProject: action,unPublishProject: action,});@@ -73,44 +62,31 @@ export class ProjectPublishStore implements IProjectPublishStore {this.projectPublishService = new ProjectPublishService();}+ /**+ * @description returns the publish settings of a particular project+ * @param {string} projectID+ * @returns {TPublishSettings | undefined}+ */+ getPublishSettingsByProjectID = (projectID: string): TPublishSettings | undefined =>+ this.publishSettingsMap?.[projectID] ?? undefined;+/*** Fetches project publish settings* @param workspaceSlug- * @param projectId+ * @param projectID* @returns*/- getProjectSettingsAsync = async (workspaceSlug: string, projectId: string) => {+ fetchPublishSettings = async (workspaceSlug: string, projectID: string) => {try {runInAction(() => {this.fetchSettingsLoader = true;});- const response = await this.projectPublishService.getProjectSettingsAsync(workspaceSlug, projectId);- if (response && response.length > 0) {- const _projectPublishSettings: IProjectPublishSettings = {- id: response[0]?.id,- comments: response[0]?.comments,- reactions: response[0]?.reactions,- votes: response[0]?.votes,- views: {- list: response[0]?.views?.list || false,- kanban: response[0]?.views?.kanban || false,- calendar: response[0]?.views?.calendar || false,- gantt: response[0]?.views?.gantt || false,- spreadsheet: response[0]?.views?.spreadsheet || false,- },- inbox: response[0]?.inbox || null,- project: response[0]?.project || null,- };- runInAction(() => {- this.projectPublishSettings = _projectPublishSettings;- this.fetchSettingsLoader = false;- });- } else {- runInAction(() => {- this.projectPublishSettings = "not-initialized";- this.fetchSettingsLoader = false;- });- }+ const response = await this.projectPublishService.fetchPublishSettings(workspaceSlug, projectID);++ runInAction(() => {+ set(this.publishSettingsMap, [projectID], response);+ this.fetchSettingsLoader = false;+ });return response;} catch (error) {runInAction(() => {@@ -123,34 +99,22 @@ export class ProjectPublishStore implements IProjectPublishStore {/*** Publishes project and updates project publish status in the store* @param workspaceSlug- * @param projectId+ * @param projectID* @param data* @returns*/- publishProject = async (workspaceSlug: string, projectId: string, data: IProjectPublishSettings) => {+ publishProject = async (workspaceSlug: string, projectID: string, data: Partial<TPublishSettings>) => {try {runInAction(() => {this.generalLoader = true;});- const response = await this.projectPublishService.createProjectSettingsAsync(workspaceSlug, projectId, data);- if (response) {- const _projectPublishSettings: IProjectPublishSettings = {- id: response?.id || null,- comments: response?.comments || false,- reactions: response?.reactions || false,- votes: response?.votes || false,- views: { ...response?.views },- inbox: response?.inbox || null,- project: response?.project || null,- };-- runInAction(() => {- this.projectPublishSettings = _projectPublishSettings;- set(this.projectRootStore.project.projectMap, [projectId, "is_deployed"], true);- this.generalLoader = false;- });- return response;- }+ const response = await this.projectPublishService.publishProject(workspaceSlug, projectID, data);+ runInAction(() => {+ set(this.publishSettingsMap, [projectID], response);+ set(this.projectRootStore.project.projectMap, [projectID, "anchor"], response.anchor);+ this.generalLoader = false;+ });+ return response;} catch (error) {runInAction(() => {this.generalLoader = false;@@ -162,43 +126,32 @@ export class ProjectPublishStore implements IProjectPublishStore {/*** Updates project publish settings* @param workspaceSlug- * @param projectId+ * @param projectID* @param projectPublishId* @param data* @returns*/- updateProjectSettingsAsync = async (+ updatePublishSettings = async (workspaceSlug: string,- projectId: string,+ projectID: string,projectPublishId: string,- data: IProjectPublishSettings+ data: Partial<TPublishSettings>) => {try {runInAction(() => {this.generalLoader = true;});- const response = await this.projectPublishService.updateProjectSettingsAsync(+ const response = await this.projectPublishService.updatePublishSettings(workspaceSlug,- projectId,+ projectID,projectPublishId,data);- if (response) {- const _projectPublishSettings: IProjectPublishSettings = {- id: response?.id || null,- comments: response?.comments || false,- reactions: response?.reactions || false,- votes: response?.votes || false,- views: { ...response?.views },- inbox: response?.inbox || null,- project: response?.project || null,- };- runInAction(() => {- this.projectPublishSettings = _projectPublishSettings;- this.generalLoader = false;- });- return response;- }+ runInAction(() => {+ set(this.publishSettingsMap, [projectID], response);+ this.generalLoader = false;+ });+ return response;} catch (error) {runInAction(() => {this.generalLoader = false;@@ -210,23 +163,19 @@ export class ProjectPublishStore implements IProjectPublishStore {/*** Unpublishes project and updates project publish status in the store* @param workspaceSlug- * @param projectId+ * @param projectID* @param projectPublishId* @returns*/- unPublishProject = async (workspaceSlug: string, projectId: string, projectPublishId: string) => {+ unPublishProject = async (workspaceSlug: string, projectID: string, projectPublishId: string) => {try {runInAction(() => {this.generalLoader = true;});- const response = await this.projectPublishService.deleteProjectSettingsAsync(- workspaceSlug,- projectId,- projectPublishId- );+ const response = await this.projectPublishService.unpublishProject(workspaceSlug, projectID, projectPublishId);runInAction(() => {- this.projectPublishSettings = "not-initialized";- set(this.projectRootStore.project.projectMap, [projectId, "is_deployed"], false);+ unset(this.publishSettingsMap, [projectID]);+ set(this.projectRootStore.project.projectMap, [projectID, "anchor"], null);this.generalLoader = false;});return response;diff --git a/web/store/root.store.ts b/web/store/root.store.tsindex 83ed43e823..9a7f5f2447 100644--- a/web/store/root.store.ts+++ b/web/store/root.store.ts@@ -4,7 +4,7 @@ import { CommandPaletteStore, ICommandPaletteStore } from "./command-palette.stoimport { CycleStore, ICycleStore } from "./cycle.store";import { CycleFilterStore, ICycleFilterStore } from "./cycle_filter.store";import { DashboardStore, IDashboardStore } from "./dashboard.store";-import { EstimateStore, IEstimateStore } from "./estimate.store";+import { IProjectEstimateStore, ProjectEstimateStore } from "./estimates/project-estimate.store";import { EventTrackerStore, IEventTrackerStore } from "./event-tracker.store";import { GlobalViewStore, IGlobalViewStore } from "./global-view.store";import { IProjectInboxStore, ProjectInboxStore } from "./inbox/project-inbox.store";@@ -39,7 +39,6 @@ export class RootStore {issue: IIssueRootStore;state: IStateStore;label: ILabelStore;- estimate: IEstimateStore;dashboard: IDashboardStore;projectPages: IProjectPageStore;router: IRouterStore;@@ -49,6 +48,7 @@ export class RootStore {instance: IInstanceStore;user: IUserStore;projectInbox: IProjectInboxStore;+ projectEstimate: IProjectEstimateStore;multipleSelect: IMultipleSelectStore;constructor() {@@ -66,7 +66,6 @@ export class RootStore {this.issue = new IssueRootStore(this);this.state = new StateStore(this);this.label = new LabelStore(this);- this.estimate = new EstimateStore(this);this.dashboard = new DashboardStore(this);this.commandPalette = new CommandPaletteStore();this.theme = new ThemeStore(this);@@ -77,6 +76,7 @@ export class RootStore {this.projectInbox = new ProjectInboxStore(this);this.projectPages = new ProjectPageStore(this);this.theme = new ThemeStore(this);+ this.projectEstimate = new ProjectEstimateStore(this);}resetOnSignOut() {@@ -95,7 +95,6 @@ export class RootStore {this.issue = new IssueRootStore(this);this.state = new StateStore(this);this.label = new LabelStore(this);- this.estimate = new EstimateStore(this);this.dashboard = new DashboardStore(this);this.router = new RouterStore();this.commandPalette = new CommandPaletteStore();@@ -105,5 +104,6 @@ export class RootStore {this.projectInbox = new ProjectInboxStore(this);this.projectPages = new ProjectPageStore(this);this.multipleSelect = new MultipleSelectStore();+ this.projectEstimate = new ProjectEstimateStore(this);}}diff --git a/yarn.lock b/yarn.lockindex c37f094a91..f25b406bc0 100644--- a/yarn.lock+++ b/yarn.lock@@ -3,9 +3,9 @@"@adobe/css-tools@^4.3.2":- version "4.3.3"- resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.3.3.tgz#90749bde8b89cd41764224f5aac29cd4138f75ff"- integrity sha512-rE0Pygv0sEZ4vBWHlAgJLGDU7Pm8xoO6p3wsEceb7GYAjScrOHpEo8KK/eVkAcnSM+slAEtXjA2JpdjLp4fJQQ==+ version "4.4.0"+ resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.4.0.tgz#728c484f4e10df03d5a3acd0d8adcbbebff8ad63"+ integrity sha512-Ff9+ksdQQB3rMncgqDK78uLznstjyfIf2Arnh22pW8kBpLs6rpKDwgnZT46hin5Hl1WzazzK64DOrhSwYpS7bQ=="@alloc/quick-lru@^5.2.0":version "5.2.0"@@ -46,9 +46,9 @@"@babel/runtime" "^7.0.0""@atlaskit/pragmatic-drag-and-drop@^1.1.0", "@atlaskit/pragmatic-drag-and-drop@^1.1.10", "@atlaskit/pragmatic-drag-and-drop@^1.1.3":- version "1.1.10"- resolved "https://registry.yarnpkg.com/@atlaskit/pragmatic-drag-and-drop/-/pragmatic-drag-and-drop-1.1.10.tgz#b7671bb6329adec6603c1805310a5ec16ff6fb7c"- integrity sha512-imiaN7bfZJM92Xq+qgbzIaKgLeHpd56w5/ECrBW1HMIXTRFauLdEo1w6PCcI4k1r18pA19E1mNhSb5+WvhMkOg==+ version "1.1.11"+ resolved "https://registry.yarnpkg.com/@atlaskit/pragmatic-drag-and-drop/-/pragmatic-drag-and-drop-1.1.11.tgz#6cadcd0cd54f72598967642fd60f6187ae7612fe"+ integrity sha512-oAwMGM68d7PrAHvcgwzJbOtZJKW6BJsc2eDWfVWb7W+lGo8tWDIFdMSmR2K+EczV03lXgdnQbRWDMcOrZ/98mQ==dependencies:"@babel/runtime" "^7.0.0"bind-event-listener "^3.0.0"@@ -61,96 +61,97 @@dependencies:default-browser-id "3.0.0"-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.6.tgz#ab88da19344445c3d8889af2216606d3329f3ef2"- integrity sha512-ZJhac6FkEd1yhG2AHOmfcXG4ceoLltoCVJjN5XsWN9BifBQr+cHJbWi0h68HZuSORq+3WtJ2z0hwF2NG1b5kcA==+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465"+ integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==dependencies:- "@babel/highlight" "^7.24.6"+ "@babel/highlight" "^7.24.7"picocolors "^1.0.0"-"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.6.tgz#b3600217688cabb26e25f8e467019e66d71b7ae2"- integrity sha512-aC2DGhBq5eEdyXWqrDInSqQjO0k8xtPRf5YylULqx8MCd6jBtzqfta/3ETMRpuKIc5hyswfO80ObyA1MvkCcUQ==+"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.7.tgz#d23bbea508c3883ba8251fb4164982c36ea577ed"+ integrity sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw=="@babel/core@^7.11.1", "@babel/core@^7.18.5", "@babel/core@^7.18.9", "@babel/core@^7.23.0", "@babel/core@^7.24.4":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.6.tgz#8650e0e4b03589ebe886c4e4a60398db0a7ec787"- integrity sha512-qAHSfAdVyFmIvl0VHELib8xar7ONuSHrE2hLnsaWkYNTI68dmi1x8GYDhJjMI/e7XWal9QBlZkwbOnkcw7Z8gQ==+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.7.tgz#b676450141e0b52a3d43bc91da86aa608f950ac4"+ integrity sha512-nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g==dependencies:"@ampproject/remapping" "^2.2.0"- "@babel/code-frame" "^7.24.6"- "@babel/generator" "^7.24.6"- "@babel/helper-compilation-targets" "^7.24.6"- "@babel/helper-module-transforms" "^7.24.6"- "@babel/helpers" "^7.24.6"- "@babel/parser" "^7.24.6"- "@babel/template" "^7.24.6"- "@babel/traverse" "^7.24.6"- "@babel/types" "^7.24.6"+ "@babel/code-frame" "^7.24.7"+ "@babel/generator" "^7.24.7"+ "@babel/helper-compilation-targets" "^7.24.7"+ "@babel/helper-module-transforms" "^7.24.7"+ "@babel/helpers" "^7.24.7"+ "@babel/parser" "^7.24.7"+ "@babel/template" "^7.24.7"+ "@babel/traverse" "^7.24.7"+ "@babel/types" "^7.24.7"convert-source-map "^2.0.0"debug "^4.1.0"gensync "^1.0.0-beta.2"json5 "^2.2.3"semver "^6.3.1"-"@babel/generator@^7.24.4", "@babel/generator@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.6.tgz#dfac82a228582a9d30c959fe50ad28951d4737a7"- integrity sha512-S7m4eNa6YAPJRHmKsLHIDJhNAGNKoWNiWefz1MBbpnt8g9lvMDl1hir4P9bo/57bQEmuwEhnRU/AMWsD0G/Fbg==+"@babel/generator@^7.24.4", "@babel/generator@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.7.tgz#1654d01de20ad66b4b4d99c135471bc654c55e6d"+ integrity sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==dependencies:- "@babel/types" "^7.24.6"+ "@babel/types" "^7.24.7""@jridgewell/gen-mapping" "^0.3.5""@jridgewell/trace-mapping" "^0.3.25"jsesc "^2.5.1"-"@babel/helper-annotate-as-pure@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.6.tgz#517af93abc77924f9b2514c407bbef527fb8938d"- integrity sha512-DitEzDfOMnd13kZnDqns1ccmftwJTS9DMkyn9pYTxulS7bZxUxpMly3Nf23QQ6NwA4UB8lAqjbqWtyvElEMAkg==+"@babel/helper-annotate-as-pure@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz#5373c7bc8366b12a033b4be1ac13a206c6656aab"+ integrity sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==dependencies:- "@babel/types" "^7.24.6"+ "@babel/types" "^7.24.7"-"@babel/helper-builder-binary-assignment-operator-visitor@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.6.tgz#19e9089ee87b0d0928012c83961a8deef4b0223f"- integrity sha512-+wnfqc5uHiMYtvRX7qu80Toef8BXeh4HHR1SPeonGb1SKPniNEd4a/nlaJJMv/OIEYvIVavvo0yR7u10Gqz0Iw==+"@babel/helper-builder-binary-assignment-operator-visitor@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz#37d66feb012024f2422b762b9b2a7cfe27c7fba3"+ integrity sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==dependencies:- "@babel/types" "^7.24.6"+ "@babel/traverse" "^7.24.7"+ "@babel/types" "^7.24.7"-"@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.6.tgz#4a51d681f7680043d38e212715e2a7b1ad29cb51"- integrity sha512-VZQ57UsDGlX/5fFA7GkVPplZhHsVc+vuErWgdOiysI9Ksnw0Pbbd6pnPiR/mmJyKHgyIW0c7KT32gmhiF+cirg==+"@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz#4eb6c4a80d6ffeac25ab8cd9a21b5dfa48d503a9"+ integrity sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg==dependencies:- "@babel/compat-data" "^7.24.6"- "@babel/helper-validator-option" "^7.24.6"+ "@babel/compat-data" "^7.24.7"+ "@babel/helper-validator-option" "^7.24.7"browserslist "^4.22.2"lru-cache "^5.1.1"semver "^6.3.1"-"@babel/helper-create-class-features-plugin@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.6.tgz#c50b86fa1c4ca9b7a890dc21884f097b6c4b5286"- integrity sha512-djsosdPJVZE6Vsw3kk7IPRWethP94WHGOhQTc67SNXE0ZzMhHgALw8iGmYS0TD1bbMM0VDROy43od7/hN6WYcA==- dependencies:- "@babel/helper-annotate-as-pure" "^7.24.6"- "@babel/helper-environment-visitor" "^7.24.6"- "@babel/helper-function-name" "^7.24.6"- "@babel/helper-member-expression-to-functions" "^7.24.6"- "@babel/helper-optimise-call-expression" "^7.24.6"- "@babel/helper-replace-supers" "^7.24.6"- "@babel/helper-skip-transparent-expression-wrappers" "^7.24.6"- "@babel/helper-split-export-declaration" "^7.24.6"+"@babel/helper-create-class-features-plugin@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.7.tgz#2eaed36b3a1c11c53bdf80d53838b293c52f5b3b"+ integrity sha512-kTkaDl7c9vO80zeX1rJxnuRpEsD5tA81yh11X1gQo+PhSti3JS+7qeZo9U4RHobKRiFPKaGK3svUAeb8D0Q7eg==+ dependencies:+ "@babel/helper-annotate-as-pure" "^7.24.7"+ "@babel/helper-environment-visitor" "^7.24.7"+ "@babel/helper-function-name" "^7.24.7"+ "@babel/helper-member-expression-to-functions" "^7.24.7"+ "@babel/helper-optimise-call-expression" "^7.24.7"+ "@babel/helper-replace-supers" "^7.24.7"+ "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"+ "@babel/helper-split-export-declaration" "^7.24.7"semver "^6.3.1"-"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.24.6.tgz#47d382dec0d49e74ca1b6f7f3b81f5968022a3c8"- integrity sha512-C875lFBIWWwyv6MHZUG9HmRrlTDgOsLWZfYR0nW69gaKJNe0/Mpxx5r0EID2ZdHQkdUmQo2t0uNckTL08/1BgA==+"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.24.7.tgz#be4f435a80dc2b053c76eeb4b7d16dd22cfc89da"+ integrity sha512-03TCmXy2FtXJEZfbXDTSqq1fRJArk7lX9DOFC/47VthYcxyIOx+eXQmdo6DOQvrbpIix+KfXwvuXdFDZHxt+rA==dependencies:- "@babel/helper-annotate-as-pure" "^7.24.6"+ "@babel/helper-annotate-as-pure" "^7.24.7"regexpu-core "^5.3.1"semver "^6.3.1"@@ -165,180 +166,187 @@lodash.debounce "^4.0.8"resolve "^1.14.2"-"@babel/helper-environment-visitor@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.6.tgz#ac7ad5517821641550f6698dd5468f8cef78620d"- integrity sha512-Y50Cg3k0LKLMjxdPjIl40SdJgMB85iXn27Vk/qbHZCFx/o5XO3PSnpi675h1KEmmDb6OFArfd5SCQEQ5Q4H88g==--"@babel/helper-function-name@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.24.6.tgz#cebdd063386fdb95d511d84b117e51fc68fec0c8"- integrity sha512-xpeLqeeRkbxhnYimfr2PC+iA0Q7ljX/d1eZ9/inYbmfG2jpl8Lu3DyXvpOAnrS5kxkfOWJjioIMQsaMBXFI05w==+"@babel/helper-environment-visitor@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz#4b31ba9551d1f90781ba83491dd59cf9b269f7d9"+ integrity sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==dependencies:- "@babel/template" "^7.24.6"- "@babel/types" "^7.24.6"+ "@babel/types" "^7.24.7"-"@babel/helper-hoist-variables@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.6.tgz#8a7ece8c26756826b6ffcdd0e3cf65de275af7f9"- integrity sha512-SF/EMrC3OD7dSta1bLJIlrsVxwtd0UpjRJqLno6125epQMJ/kyFmpTT4pbvPbdQHzCHg+biQ7Syo8lnDtbR+uA==+"@babel/helper-function-name@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz#75f1e1725742f39ac6584ee0b16d94513da38dd2"+ integrity sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==dependencies:- "@babel/types" "^7.24.6"+ "@babel/template" "^7.24.7"+ "@babel/types" "^7.24.7"++"@babel/helper-hoist-variables@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz#b4ede1cde2fd89436397f30dc9376ee06b0f25ee"+ integrity sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==+ dependencies:+ "@babel/types" "^7.24.7"-"@babel/helper-member-expression-to-functions@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.6.tgz#86084f3e0e4e2169a134754df3870bc7784db71e"- integrity sha512-OTsCufZTxDUsv2/eDXanw/mUZHWOxSbEmC3pP8cgjcy5rgeVPWWMStnv274DV60JtHxTk0adT0QrCzC4M9NWGg==- dependencies:- "@babel/types" "^7.24.6"--"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.6.tgz#65e54ffceed6a268dc4ce11f0433b82cfff57852"- integrity sha512-a26dmxFJBF62rRO9mmpgrfTLsAuyHk4e1hKTUkD/fcMfynt8gvEKwQPQDVxWhca8dHoDck+55DFt42zV0QMw5g==- dependencies:- "@babel/types" "^7.24.6"--"@babel/helper-module-transforms@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.6.tgz#22346ed9df44ce84dee850d7433c5b73fab1fe4e"- integrity sha512-Y/YMPm83mV2HJTbX1Qh2sjgjqcacvOlhbzdCCsSlblOKjSYmQqEbO6rUniWQyRo9ncyfjT8hnUjlG06RXDEmcA==- dependencies:- "@babel/helper-environment-visitor" "^7.24.6"- "@babel/helper-module-imports" "^7.24.6"- "@babel/helper-simple-access" "^7.24.6"- "@babel/helper-split-export-declaration" "^7.24.6"- "@babel/helper-validator-identifier" "^7.24.6"--"@babel/helper-optimise-call-expression@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.6.tgz#f7836e3ccca3dfa02f15d2bc8b794efe75a5256e"- integrity sha512-3SFDJRbx7KuPRl8XDUr8O7GAEB8iGyWPjLKJh/ywP/Iy9WOmEfMrsWbaZpvBu2HSYn4KQygIsz0O7m8y10ncMA==- dependencies:- "@babel/types" "^7.24.6"--"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.6", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.6.tgz#fa02a32410a15a6e8f8185bcbf608f10528d2a24"- integrity sha512-MZG/JcWfxybKwsA9N9PmtF2lOSFSEMVCpIRrbxccZFLJPrJciJdG/UhSh5W96GEteJI2ARqm5UAHxISwRDLSNg==--"@babel/helper-remap-async-to-generator@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.24.6.tgz#c96ceb9846e877d806ce82a1521230ea7e0fc354"- integrity sha512-1Qursq9ArRZPAMOZf/nuzVW8HgJLkTB9y9LfP4lW2MVp4e9WkLJDovfKBxoDcCk6VuzIxyqWHyBoaCtSRP10yg==- dependencies:- "@babel/helper-annotate-as-pure" "^7.24.6"- "@babel/helper-environment-visitor" "^7.24.6"- "@babel/helper-wrap-function" "^7.24.6"--"@babel/helper-replace-supers@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.24.6.tgz#3ea87405a2986a49ab052d10e540fe036d747c71"- integrity sha512-mRhfPwDqDpba8o1F8ESxsEkJMQkUF8ZIWrAc0FtWhxnjfextxMWxr22RtFizxxSYLjVHDeMgVsRq8BBZR2ikJQ==- dependencies:- "@babel/helper-environment-visitor" "^7.24.6"- "@babel/helper-member-expression-to-functions" "^7.24.6"- "@babel/helper-optimise-call-expression" "^7.24.6"--"@babel/helper-simple-access@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.24.6.tgz#1d6e04d468bba4fc963b4906f6dac6286cfedff1"- integrity sha512-nZzcMMD4ZhmB35MOOzQuiGO5RzL6tJbsT37Zx8M5L/i9KSrukGXWTjLe1knIbb/RmxoJE9GON9soq0c0VEMM5g==- dependencies:- "@babel/types" "^7.24.6"--"@babel/helper-skip-transparent-expression-wrappers@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.6.tgz#c47e9b33b7ea50d1073e125ebc26661717cb7040"- integrity sha512-jhbbkK3IUKc4T43WadP96a27oYti9gEf1LdyGSP2rHGH77kwLwfhO7TgwnWvxxQVmke0ImmCSS47vcuxEMGD3Q==- dependencies:- "@babel/types" "^7.24.6"--"@babel/helper-split-export-declaration@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.6.tgz#e830068f7ba8861c53b7421c284da30ae656d7a3"- integrity sha512-CvLSkwXGWnYlF9+J3iZUvwgAxKiYzK3BWuo+mLzD/MDGOZDj7Gq8+hqaOkMxmJwmlv0iu86uH5fdADd9Hxkymw==- dependencies:- "@babel/types" "^7.24.6"--"@babel/helper-string-parser@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.6.tgz#28583c28b15f2a3339cfafafeaad42f9a0e828df"- integrity sha512-WdJjwMEkmBicq5T9fm/cHND3+UlFa2Yj8ALLgmoSQAJZysYbBjw+azChSGPN4DSPLXOcooGRvDwZWMcF/mLO2Q==--"@babel/helper-validator-identifier@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.6.tgz#08bb6612b11bdec78f3feed3db196da682454a5e"- integrity sha512-4yA7s865JHaqUdRbnaxarZREuPTHrjpDT+pXoAZ1yhyo6uFnIEpS8VMu16siFOHDpZNKYv5BObhsB//ycbICyw==--"@babel/helper-validator-option@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.6.tgz#59d8e81c40b7d9109ab7e74457393442177f460a"- integrity sha512-Jktc8KkF3zIkePb48QO+IapbXlSapOW9S+ogZZkcO6bABgYAxtZcjZ/O005111YLf+j4M84uEgwYoidDkXbCkQ==--"@babel/helper-wrap-function@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.24.6.tgz#c27af1006e310683fdc76b668a0a1f6003e36217"- integrity sha512-f1JLrlw/jbiNfxvdrfBgio/gRBk3yTAEJWirpAkiJG2Hb22E7cEYKHWo0dFPTv/niPovzIdPdEDetrv6tC6gPQ==- dependencies:- "@babel/helper-function-name" "^7.24.6"- "@babel/template" "^7.24.6"- "@babel/types" "^7.24.6"--"@babel/helpers@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.6.tgz#cd124245299e494bd4e00edda0e4ea3545c2c176"- integrity sha512-V2PI+NqnyFu1i0GyTd/O/cTpxzQCYioSkUIRmgo7gFEHKKCg5w46+r/A6WeUR1+P3TeQ49dspGPNd/E3n9AnnA==- dependencies:- "@babel/template" "^7.24.6"- "@babel/types" "^7.24.6"--"@babel/highlight@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.6.tgz#6d610c1ebd2c6e061cade0153bf69b0590b7b3df"- integrity sha512-2YnuOp4HAk2BsBrJJvYCbItHx0zWscI1C3zgWkz+wDyD9I7GIVrfnLyrR4Y1VR+7p+chAEcrgRQYZAGIKMV7vQ==- dependencies:- "@babel/helper-validator-identifier" "^7.24.6"+"@babel/helper-member-expression-to-functions@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.7.tgz#67613d068615a70e4ed5101099affc7a41c5225f"+ integrity sha512-LGeMaf5JN4hAT471eJdBs/GK1DoYIJ5GCtZN/EsL6KUiiDZOvO/eKE11AMZJa2zP4zk4qe9V2O/hxAmkRc8p6w==+ dependencies:+ "@babel/traverse" "^7.24.7"+ "@babel/types" "^7.24.7"++"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b"+ integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==+ dependencies:+ "@babel/traverse" "^7.24.7"+ "@babel/types" "^7.24.7"++"@babel/helper-module-transforms@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz#31b6c9a2930679498db65b685b1698bfd6c7daf8"+ integrity sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==+ dependencies:+ "@babel/helper-environment-visitor" "^7.24.7"+ "@babel/helper-module-imports" "^7.24.7"+ "@babel/helper-simple-access" "^7.24.7"+ "@babel/helper-split-export-declaration" "^7.24.7"+ "@babel/helper-validator-identifier" "^7.24.7"++"@babel/helper-optimise-call-expression@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz#8b0a0456c92f6b323d27cfd00d1d664e76692a0f"+ integrity sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==+ dependencies:+ "@babel/types" "^7.24.7"++"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz#98c84fe6fe3d0d3ae7bfc3a5e166a46844feb2a0"+ integrity sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg==++"@babel/helper-remap-async-to-generator@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.24.7.tgz#b3f0f203628522713849d49403f1a414468be4c7"+ integrity sha512-9pKLcTlZ92hNZMQfGCHImUpDOlAgkkpqalWEeftW5FBya75k8Li2ilerxkM/uBEj01iBZXcCIB/bwvDYgWyibA==+ dependencies:+ "@babel/helper-annotate-as-pure" "^7.24.7"+ "@babel/helper-environment-visitor" "^7.24.7"+ "@babel/helper-wrap-function" "^7.24.7"++"@babel/helper-replace-supers@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.24.7.tgz#f933b7eed81a1c0265740edc91491ce51250f765"+ integrity sha512-qTAxxBM81VEyoAY0TtLrx1oAEJc09ZK67Q9ljQToqCnA+55eNwCORaxlKyu+rNfX86o8OXRUSNUnrtsAZXM9sg==+ dependencies:+ "@babel/helper-environment-visitor" "^7.24.7"+ "@babel/helper-member-expression-to-functions" "^7.24.7"+ "@babel/helper-optimise-call-expression" "^7.24.7"++"@babel/helper-simple-access@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz#bcade8da3aec8ed16b9c4953b74e506b51b5edb3"+ integrity sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==+ dependencies:+ "@babel/traverse" "^7.24.7"+ "@babel/types" "^7.24.7"++"@babel/helper-skip-transparent-expression-wrappers@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz#5f8fa83b69ed5c27adc56044f8be2b3ea96669d9"+ integrity sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==+ dependencies:+ "@babel/traverse" "^7.24.7"+ "@babel/types" "^7.24.7"++"@babel/helper-split-export-declaration@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz#83949436890e07fa3d6873c61a96e3bbf692d856"+ integrity sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==+ dependencies:+ "@babel/types" "^7.24.7"++"@babel/helper-string-parser@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz#4d2d0f14820ede3b9807ea5fc36dfc8cd7da07f2"+ integrity sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==++"@babel/helper-validator-identifier@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db"+ integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==++"@babel/helper-validator-option@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz#24c3bb77c7a425d1742eec8fb433b5a1b38e62f6"+ integrity sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw==++"@babel/helper-wrap-function@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.24.7.tgz#52d893af7e42edca7c6d2c6764549826336aae1f"+ integrity sha512-N9JIYk3TD+1vq/wn77YnJOqMtfWhNewNE+DJV4puD2X7Ew9J4JvrzrFDfTfyv5EgEXVy9/Wt8QiOErzEmv5Ifw==+ dependencies:+ "@babel/helper-function-name" "^7.24.7"+ "@babel/template" "^7.24.7"+ "@babel/traverse" "^7.24.7"+ "@babel/types" "^7.24.7"++"@babel/helpers@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.7.tgz#aa2ccda29f62185acb5d42fb4a3a1b1082107416"+ integrity sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg==+ dependencies:+ "@babel/template" "^7.24.7"+ "@babel/types" "^7.24.7"++"@babel/highlight@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d"+ integrity sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==+ dependencies:+ "@babel/helper-validator-identifier" "^7.24.7"chalk "^2.4.2"js-tokens "^4.0.0"picocolors "^1.0.0"-"@babel/parser@^7.1.0", "@babel/parser@^7.20.7", "@babel/parser@^7.23.0", "@babel/parser@^7.24.4", "@babel/parser@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.6.tgz#5e030f440c3c6c78d195528c3b688b101a365328"- integrity sha512-eNZXdfU35nJC2h24RznROuOpO94h6x8sg9ju0tT9biNtLZ2vuP8SduLqqV+/8+cebSLV9SJEAN5Z3zQbJG/M+Q==+"@babel/parser@^7.1.0", "@babel/parser@^7.20.7", "@babel/parser@^7.23.0", "@babel/parser@^7.24.4", "@babel/parser@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.7.tgz#9a5226f92f0c5c8ead550b750f5608e766c8ce85"+ integrity sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==-"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.6.tgz#283a74ef365b1e954cda6b2724c678a978215e88"- integrity sha512-bYndrJ6Ph6Ar+GaB5VAc0JPoP80bQCm4qon6JEzXfRl5QZyQ8Ur1K6k7htxWmPA5z+k7JQvaMUrtXlqclWYzKw==+"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.7.tgz#fd059fd27b184ea2b4c7e646868a9a381bbc3055"+ integrity sha512-TiT1ss81W80eQsN+722OaeQMY/G4yTb4G9JrqeiDADs3N8lbPMGldWi9x8tyqCW5NLx1Jh2AvkE6r6QvEltMMQ==dependencies:- "@babel/helper-environment-visitor" "^7.24.6"- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-environment-visitor" "^7.24.7"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.6.tgz#f9f5ae4d6fb72f5950262cb6f0b2482c3bc684ef"- integrity sha512-iVuhb6poq5ikqRq2XWU6OQ+R5o9wF+r/or9CeUyovgptz0UlnK4/seOQ1Istu/XybYjAhQv1FRSSfHHufIku5Q==+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.7.tgz#468096ca44bbcbe8fcc570574e12eb1950e18107"+ integrity sha512-unaQgZ/iRu/By6tsjMZzpeBZjChYfLYry6HrEXPoz3KmfF0sVBQ1l8zKMQ4xRGLWVsjuvB8nQfjNP/DcfEOCsg==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.6.tgz#ab9be6edfffa127bd5ec4317c76c5af0f8fc7e6c"- integrity sha512-c8TER5xMDYzzFcGqOEp9l4hvB7dcbhcGjcLVwxWfe4P5DOafdwjsBJZKsmv+o3aXh7NhopvayQIovHrh2zSRUQ==+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz#e4eabdd5109acc399b38d7999b2ef66fc2022f89"+ integrity sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"- "@babel/helper-skip-transparent-expression-wrappers" "^7.24.6"- "@babel/plugin-transform-optional-chaining" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"+ "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"+ "@babel/plugin-transform-optional-chaining" "^7.24.7"-"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.6.tgz#0faf879249ec622d7f1c42eaebf7d11197401b2c"- integrity sha512-z8zEjYmwBUHN/pCF3NuWBhHQjJCrd33qAi8MgANfMrAvn72k2cImT8VjK9LJFu4ysOLJqhfkYYb3MvwANRUNZQ==+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.7.tgz#71b21bb0286d5810e63a1538aa901c58e87375ec"+ integrity sha512-utA4HuR6F4Vvcr+o4DnjL8fCOlgRFGbeeBEGNg3ZTrLFw6VWG5XmUrvcQ0FjIYMU2ST4XcR2Wsp7t9qOAPnxMg==dependencies:- "@babel/helper-environment-visitor" "^7.24.6"- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-environment-visitor" "^7.24.7"+ "@babel/helper-plugin-utils" "^7.24.7""@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2":version "7.21.0-placeholder-for-preset-env.2"@@ -380,26 +388,26 @@dependencies:"@babel/helper-plugin-utils" "^7.8.3"-"@babel/plugin-syntax-flow@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.24.6.tgz#1102a710771326b8e2f0c85ac2aecb6f52eb601e"- integrity sha512-gNkksSdV8RbsCoHF9sjVYrHfYACMl/8U32UfUhJ9+84/ASXw8dlx+eHyyF0m6ncQJ9IBSxfuCkB36GJqYdXTOA==+"@babel/plugin-syntax-flow@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.24.7.tgz#d1759e84dd4b437cf9fae69b4c06c41d7625bfb7"+ integrity sha512-9G8GYT/dxn/D1IIKOUBmGX0mnmj46mGH9NnZyJLwtCpgh5f7D2VbuKodb+2s9m1Yavh1s7ASQN8lf0eqrb1LTw==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-syntax-import-assertions@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.6.tgz#52521c1c1698fc2dd9cf88f7a4dd86d4d041b9e1"- integrity sha512-BE6o2BogJKJImTmGpkmOic4V0hlRRxVtzqxiSPa8TIFxyhi4EFjHm08nq1M4STK4RytuLMgnSz0/wfflvGFNOg==+"@babel/plugin-syntax-import-assertions@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz#2a0b406b5871a20a841240586b1300ce2088a778"+ integrity sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-syntax-import-attributes@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.6.tgz#12aba325534129584672920274fefa4dc2d5f68e"- integrity sha512-D+CfsVZousPXIdudSII7RGy52+dYRtbyKAZcvtQKq/NpsivyMVduepzcLqG5pMBugtMdedxdC8Ramdpcne9ZWQ==+"@babel/plugin-syntax-import-attributes@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz#b4f9ea95a79e6912480c4b626739f86a076624ca"+ integrity sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7""@babel/plugin-syntax-import-meta@^7.10.4":version "7.10.4"@@ -415,12 +423,12 @@dependencies:"@babel/helper-plugin-utils" "^7.8.0"-"@babel/plugin-syntax-jsx@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.6.tgz#bcca2964150437f88f65e3679e3d68762287b9c8"- integrity sha512-lWfvAIFNWMlCsU0DRUun2GpFwZdGTukLaHJqRh1JRb80NdAP5Sb1HDHB5X9P9OtgZHQl089UzQkpYlBq2VTPRw==+"@babel/plugin-syntax-jsx@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz#39a1fa4a7e3d3d7f34e2acc6be585b718d30e02d"+ integrity sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7""@babel/plugin-syntax-logical-assignment-operators@^7.10.4":version "7.10.4"@@ -478,12 +486,12 @@dependencies:"@babel/helper-plugin-utils" "^7.14.5"-"@babel/plugin-syntax-typescript@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.6.tgz#769daf2982d60308bc83d8936eaecb7582463c87"- integrity sha512-TzCtxGgVTEJWWwcYwQhCIQ6WaKlo80/B+Onsk4RRCcYqpYGFcG9etPW94VToGte5AAcxRrhjPUFvUS3Y2qKi4A==+"@babel/plugin-syntax-typescript@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.7.tgz#58d458271b4d3b6bb27ee6ac9525acbb259bad1c"+ integrity sha512-c/+fVeJBB0FeKsFvwytYiUD+LBvhHjGSI0g446PRGdSVGZLRNArBUno2PETbAly3tpiNAQR5XaZ+JslxkotsbA==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7""@babel/plugin-syntax-unicode-sets-regex@^7.18.6":version "7.18.6"@@ -493,432 +501,432 @@"@babel/helper-create-regexp-features-plugin" "^7.18.6""@babel/helper-plugin-utils" "^7.18.6"-"@babel/plugin-transform-arrow-functions@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.6.tgz#93607d1ef5b81c70af174aff3532d57216367492"- integrity sha512-jSSSDt4ZidNMggcLx8SaKsbGNEfIl0PHx/4mFEulorE7bpYLbN0d3pDW3eJ7Y5Z3yPhy3L3NaPCYyTUY7TuugQ==+"@babel/plugin-transform-arrow-functions@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz#4f6886c11e423bd69f3ce51dbf42424a5f275514"+ integrity sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-transform-async-generator-functions@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.24.6.tgz#fa4a9e5c3a7f60f697ba36587b6c41b04f507d84"- integrity sha512-VEP2o4iR2DqQU6KPgizTW2mnMx6BG5b5O9iQdrW9HesLkv8GIA8x2daXBQxw1MrsIkFQGA/iJ204CKoQ8UcnAA==+"@babel/plugin-transform-async-generator-functions@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.24.7.tgz#7330a5c50e05181ca52351b8fd01642000c96cfd"+ integrity sha512-o+iF77e3u7ZS4AoAuJvapz9Fm001PuD2V3Lp6OSE4FYQke+cSewYtnek+THqGRWyQloRCyvWL1OkyfNEl9vr/g==dependencies:- "@babel/helper-environment-visitor" "^7.24.6"- "@babel/helper-plugin-utils" "^7.24.6"- "@babel/helper-remap-async-to-generator" "^7.24.6"+ "@babel/helper-environment-visitor" "^7.24.7"+ "@babel/helper-plugin-utils" "^7.24.7"+ "@babel/helper-remap-async-to-generator" "^7.24.7""@babel/plugin-syntax-async-generators" "^7.8.4"-"@babel/plugin-transform-async-to-generator@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.6.tgz#eb11434b11d73d8c0cf9f71a6f4f1e6ba441df35"- integrity sha512-NTBA2SioI3OsHeIn6sQmhvXleSl9T70YY/hostQLveWs0ic+qvbA3fa0kwAwQ0OA/XGaAerNZRQGJyRfhbJK4g==+"@babel/plugin-transform-async-to-generator@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz#72a3af6c451d575842a7e9b5a02863414355bdcc"+ integrity sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==dependencies:- "@babel/helper-module-imports" "^7.24.6"- "@babel/helper-plugin-utils" "^7.24.6"- "@babel/helper-remap-async-to-generator" "^7.24.6"+ "@babel/helper-module-imports" "^7.24.7"+ "@babel/helper-plugin-utils" "^7.24.7"+ "@babel/helper-remap-async-to-generator" "^7.24.7"-"@babel/plugin-transform-block-scoped-functions@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.6.tgz#975555b5bfa9870b1218da536d1528735f1f8c56"- integrity sha512-XNW7jolYHW9CwORrZgA/97tL/k05qe/HL0z/qqJq1mdWhwwCM6D4BJBV7wAz9HgFziN5dTOG31znkVIzwxv+vw==+"@babel/plugin-transform-block-scoped-functions@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz#a4251d98ea0c0f399dafe1a35801eaba455bbf1f"+ integrity sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-transform-block-scoping@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.6.tgz#a03ec8a4591c2b43cf7798bc633e698293fda179"- integrity sha512-S/t1Xh4ehW7sGA7c1j/hiOBLnEYCp/c2sEG4ZkL8kI1xX9tW2pqJTCHKtdhe/jHKt8nG0pFCrDHUXd4DvjHS9w==+"@babel/plugin-transform-block-scoping@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.7.tgz#42063e4deb850c7bd7c55e626bf4e7ab48e6ce02"+ integrity sha512-Nd5CvgMbWc+oWzBsuaMcbwjJWAcp5qzrbg69SZdHSP7AMY0AbWFqFO0WTFCA1jxhMCwodRwvRec8k0QUbZk7RQ==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-transform-class-properties@^7.22.5", "@babel/plugin-transform-class-properties@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.6.tgz#d9f394e97e88ef905d5a1e5e7a16238621b7982e"- integrity sha512-j6dZ0Z2Z2slWLR3kt9aOmSIrBvnntWjMDN/TVcMPxhXMLmJVqX605CBRlcGI4b32GMbfifTEsdEjGjiE+j/c3A==+"@babel/plugin-transform-class-properties@^7.22.5", "@babel/plugin-transform-class-properties@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.7.tgz#256879467b57b0b68c7ddfc5b76584f398cd6834"+ integrity sha512-vKbfawVYayKcSeSR5YYzzyXvsDFWU2mD8U5TFeXtbCPLFUqe7GyCgvO6XDHzje862ODrOwy6WCPmKeWHbCFJ4w==dependencies:- "@babel/helper-create-class-features-plugin" "^7.24.6"- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-create-class-features-plugin" "^7.24.7"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-transform-class-static-block@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.6.tgz#f43f29286f6f0dca33d18fd5033b817d6c3fa816"- integrity sha512-1QSRfoPI9RoLRa8Mnakc6v3e0gJxiZQTYrMfLn+mD0sz5+ndSzwymp2hDcYJTyT0MOn0yuWzj8phlIvO72gTHA==+"@babel/plugin-transform-class-static-block@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz#c82027ebb7010bc33c116d4b5044fbbf8c05484d"+ integrity sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==dependencies:- "@babel/helper-create-class-features-plugin" "^7.24.6"- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-create-class-features-plugin" "^7.24.7"+ "@babel/helper-plugin-utils" "^7.24.7""@babel/plugin-syntax-class-static-block" "^7.14.5"-"@babel/plugin-transform-classes@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.6.tgz#0cc198c02720d4eeb091004843477659c6b37977"- integrity sha512-+fN+NO2gh8JtRmDSOB6gaCVo36ha8kfCW1nMq2Gc0DABln0VcHN4PrALDvF5/diLzIRKptC7z/d7Lp64zk92Fg==- dependencies:- "@babel/helper-annotate-as-pure" "^7.24.6"- "@babel/helper-compilation-targets" "^7.24.6"- "@babel/helper-environment-visitor" "^7.24.6"- "@babel/helper-function-name" "^7.24.6"- "@babel/helper-plugin-utils" "^7.24.6"- "@babel/helper-replace-supers" "^7.24.6"- "@babel/helper-split-export-declaration" "^7.24.6"+"@babel/plugin-transform-classes@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.7.tgz#4ae6ef43a12492134138c1e45913f7c46c41b4bf"+ integrity sha512-CFbbBigp8ln4FU6Bpy6g7sE8B/WmCmzvivzUC6xDAdWVsjYTXijpuuGJmYkAaoWAzcItGKT3IOAbxRItZ5HTjw==+ dependencies:+ "@babel/helper-annotate-as-pure" "^7.24.7"+ "@babel/helper-compilation-targets" "^7.24.7"+ "@babel/helper-environment-visitor" "^7.24.7"+ "@babel/helper-function-name" "^7.24.7"+ "@babel/helper-plugin-utils" "^7.24.7"+ "@babel/helper-replace-supers" "^7.24.7"+ "@babel/helper-split-export-declaration" "^7.24.7"globals "^11.1.0"-"@babel/plugin-transform-computed-properties@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.6.tgz#7a1765c01cdfe59c320d2d0f37a4dc4aecd14df1"- integrity sha512-cRzPobcfRP0ZtuIEkA8QzghoUpSB3X3qSH5W2+FzG+VjWbJXExtx0nbRqwumdBN1x/ot2SlTNQLfBCnPdzp6kg==+"@babel/plugin-transform-computed-properties@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz#4cab3214e80bc71fae3853238d13d097b004c707"+ integrity sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"- "@babel/template" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"+ "@babel/template" "^7.24.7"-"@babel/plugin-transform-destructuring@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.6.tgz#bdd1a6c90ffb2bfd13b6007b13316eeafc97cb53"- integrity sha512-YLW6AE5LQpk5npNXL7i/O+U9CE4XsBCuRPgyjl1EICZYKmcitV+ayuuUGMJm2lC1WWjXYszeTnIxF/dq/GhIZQ==+"@babel/plugin-transform-destructuring@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.7.tgz#a097f25292defb6e6cc16d6333a4cfc1e3c72d9e"+ integrity sha512-19eJO/8kdCQ9zISOf+SEUJM/bAUIsvY3YDnXZTupUCQ8LgrWnsG/gFB9dvXqdXnRXMAM8fvt7b0CBKQHNGy1mw==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-transform-dotall-regex@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.6.tgz#5a6b3148ec5f4f274ff48cebea90565087cad126"- integrity sha512-rCXPnSEKvkm/EjzOtLoGvKseK+dS4kZwx1HexO3BtRtgL0fQ34awHn34aeSHuXtZY2F8a1X8xqBBPRtOxDVmcA==+"@babel/plugin-transform-dotall-regex@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz#5f8bf8a680f2116a7207e16288a5f974ad47a7a0"+ integrity sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==dependencies:- "@babel/helper-create-regexp-features-plugin" "^7.24.6"- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-create-regexp-features-plugin" "^7.24.7"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-transform-duplicate-keys@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.6.tgz#2716301227cf7cd4fdadcbe4353ce191f8b3dc8a"- integrity sha512-/8Odwp/aVkZwPFJMllSbawhDAO3UJi65foB00HYnK/uXvvCPm0TAXSByjz1mpRmp0q6oX2SIxpkUOpPFHk7FLA==+"@babel/plugin-transform-duplicate-keys@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz#dd20102897c9a2324e5adfffb67ff3610359a8ee"+ integrity sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-transform-dynamic-import@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.6.tgz#b477177761d56b15a4ba42a83be31cf72d757acf"- integrity sha512-vpq8SSLRTBLOHUZHSnBqVo0AKX3PBaoPs2vVzYVWslXDTDIpwAcCDtfhUcHSQQoYoUvcFPTdC8TZYXu9ZnLT/w==+"@babel/plugin-transform-dynamic-import@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz#4d8b95e3bae2b037673091aa09cd33fecd6419f4"+ integrity sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7""@babel/plugin-syntax-dynamic-import" "^7.8.3"-"@babel/plugin-transform-exponentiation-operator@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.6.tgz#011e9e1a429f91b024af572530873ca571f9ef06"- integrity sha512-EemYpHtmz0lHE7hxxxYEuTYOOBZ43WkDgZ4arQ4r+VX9QHuNZC+WH3wUWmRNvR8ECpTRne29aZV6XO22qpOtdA==+"@babel/plugin-transform-exponentiation-operator@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz#b629ee22645f412024297d5245bce425c31f9b0d"+ integrity sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==dependencies:- "@babel/helper-builder-binary-assignment-operator-visitor" "^7.24.6"- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.24.7"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-transform-export-namespace-from@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.6.tgz#b64ded74d9afb3db5d47d93996c4df69f15ac97c"- integrity sha512-inXaTM1SVrIxCkIJ5gqWiozHfFMStuGbGJAxZFBoHcRRdDP0ySLb3jH6JOwmfiinPwyMZqMBX+7NBDCO4z0NSA==+"@babel/plugin-transform-export-namespace-from@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz#176d52d8d8ed516aeae7013ee9556d540c53f197"+ integrity sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7""@babel/plugin-syntax-export-namespace-from" "^7.8.3"-"@babel/plugin-transform-flow-strip-types@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.24.6.tgz#dfd9d1c90e74335bc68d82f41ad9224960a4de84"- integrity sha512-1l8b24NoCpaQ13Vi6FtLG1nv6kNoi8PWvQb1AYO7GHZDpFfBYc3lbXArx1lP2KRt8b4pej1eWc/zrRmsQTfOdQ==+"@babel/plugin-transform-flow-strip-types@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.24.7.tgz#ae454e62219288fbb734541ab00389bfb13c063e"+ integrity sha512-cjRKJ7FobOH2eakx7Ja+KpJRj8+y+/SiB3ooYm/n2UJfxu0oEaOoxOinitkJcPqv9KxS0kxTGPUaR7L2XcXDXA==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"- "@babel/plugin-syntax-flow" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"+ "@babel/plugin-syntax-flow" "^7.24.7"-"@babel/plugin-transform-for-of@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.6.tgz#7f31780bd0c582b546372c0c0da9d9d56731e0a2"- integrity sha512-n3Sf72TnqK4nw/jziSqEl1qaWPbCRw2CziHH+jdRYvw4J6yeCzsj4jdw8hIntOEeDGTmHVe2w4MVL44PN0GMzg==+"@babel/plugin-transform-for-of@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz#f25b33f72df1d8be76399e1b8f3f9d366eb5bc70"+ integrity sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"- "@babel/helper-skip-transparent-expression-wrappers" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"+ "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"-"@babel/plugin-transform-function-name@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.6.tgz#60d1de3f6fd816a3e3bf9538578a64527e1b9c97"- integrity sha512-sOajCu6V0P1KPljWHKiDq6ymgqB+vfo3isUS4McqW1DZtvSVU2v/wuMhmRmkg3sFoq6GMaUUf8W4WtoSLkOV/Q==+"@babel/plugin-transform-function-name@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.7.tgz#6d8601fbffe665c894440ab4470bc721dd9131d6"+ integrity sha512-U9FcnA821YoILngSmYkW6FjyQe2TyZD5pHt4EVIhmcTkrJw/3KqcrRSxuOo5tFZJi7TE19iDyI1u+weTI7bn2w==dependencies:- "@babel/helper-compilation-targets" "^7.24.6"- "@babel/helper-function-name" "^7.24.6"- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-compilation-targets" "^7.24.7"+ "@babel/helper-function-name" "^7.24.7"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-transform-json-strings@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.6.tgz#a84639180ea1f9001bb5e6dc01921235ab05ad8b"- integrity sha512-Uvgd9p2gUnzYJxVdBLcU0KurF8aVhkmVyMKW4MIY1/BByvs3EBpv45q01o7pRTVmTvtQq5zDlytP3dcUgm7v9w==+"@babel/plugin-transform-json-strings@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz#f3e9c37c0a373fee86e36880d45b3664cedaf73a"+ integrity sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7""@babel/plugin-syntax-json-strings" "^7.8.3"-"@babel/plugin-transform-literals@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.6.tgz#7f44f2871d7a4456030b0540858046f0b7bc6b18"- integrity sha512-f2wHfR2HF6yMj+y+/y07+SLqnOSwRp8KYLpQKOzS58XLVlULhXbiYcygfXQxJlMbhII9+yXDwOUFLf60/TL5tw==+"@babel/plugin-transform-literals@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.7.tgz#36b505c1e655151a9d7607799a9988fc5467d06c"+ integrity sha512-vcwCbb4HDH+hWi8Pqenwnjy+UiklO4Kt1vfspcQYFhJdpthSnW8XvWGyDZWKNVrVbVViI/S7K9PDJZiUmP2fYQ==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-transform-logical-assignment-operators@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.6.tgz#9cc7baa5629866566562c159dc1eae7569810f33"- integrity sha512-EKaWvnezBCMkRIHxMJSIIylzhqK09YpiJtDbr2wsXTwnO0TxyjMUkaw4RlFIZMIS0iDj0KyIg7H7XCguHu/YDA==+"@babel/plugin-transform-logical-assignment-operators@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz#a58fb6eda16c9dc8f9ff1c7b1ba6deb7f4694cb0"+ integrity sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7""@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"-"@babel/plugin-transform-member-expression-literals@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.6.tgz#5d3681ca201ac6909419cc51ac082a6ba4c5c756"- integrity sha512-9g8iV146szUo5GWgXpRbq/GALTnY+WnNuRTuRHWWFfWGbP9ukRL0aO/jpu9dmOPikclkxnNsjY8/gsWl6bmZJQ==+"@babel/plugin-transform-member-expression-literals@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz#3b4454fb0e302e18ba4945ba3246acb1248315df"+ integrity sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-transform-modules-amd@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.6.tgz#09aeac7acb7913496aaaafdc64f40683e0db7e41"- integrity sha512-eAGogjZgcwqAxhyFgqghvoHRr+EYRQPFjUXrTYKBRb5qPnAVxOOglaxc4/byHqjvq/bqO2F3/CGwTHsgKJYHhQ==+"@babel/plugin-transform-modules-amd@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz#65090ed493c4a834976a3ca1cde776e6ccff32d7"+ integrity sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==dependencies:- "@babel/helper-module-transforms" "^7.24.6"- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-module-transforms" "^7.24.7"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-transform-modules-commonjs@^7.23.0", "@babel/plugin-transform-modules-commonjs@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.6.tgz#1b8269902f25bd91ca6427230d4735ddd1e1283e"- integrity sha512-JEV8l3MHdmmdb7S7Cmx6rbNEjRCgTQMZxllveHO0mx6uiclB0NflCawlQQ6+o5ZrwjUBYPzHm2XoK4wqGVUFuw==+"@babel/plugin-transform-modules-commonjs@^7.23.0", "@babel/plugin-transform-modules-commonjs@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.7.tgz#9fd5f7fdadee9085886b183f1ad13d1ab260f4ab"+ integrity sha512-iFI8GDxtevHJ/Z22J5xQpVqFLlMNstcLXh994xifFwxxGslr2ZXXLWgtBeLctOD63UFDArdvN6Tg8RFw+aEmjQ==dependencies:- "@babel/helper-module-transforms" "^7.24.6"- "@babel/helper-plugin-utils" "^7.24.6"- "@babel/helper-simple-access" "^7.24.6"+ "@babel/helper-module-transforms" "^7.24.7"+ "@babel/helper-plugin-utils" "^7.24.7"+ "@babel/helper-simple-access" "^7.24.7"-"@babel/plugin-transform-modules-systemjs@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.6.tgz#c54eb53fe16f9b82d320abd76762d0320e3f9393"- integrity sha512-xg1Z0J5JVYxtpX954XqaaAT6NpAY6LtZXvYFCJmGFJWwtlz2EmJoR8LycFRGNE8dBKizGWkGQZGegtkV8y8s+w==+"@babel/plugin-transform-modules-systemjs@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.7.tgz#f8012316c5098f6e8dee6ecd58e2bc6f003d0ce7"+ integrity sha512-GYQE0tW7YoaN13qFh3O1NCY4MPkUiAH3fiF7UcV/I3ajmDKEdG3l+UOcbAm4zUE3gnvUU+Eni7XrVKo9eO9auw==dependencies:- "@babel/helper-hoist-variables" "^7.24.6"- "@babel/helper-module-transforms" "^7.24.6"- "@babel/helper-plugin-utils" "^7.24.6"- "@babel/helper-validator-identifier" "^7.24.6"+ "@babel/helper-hoist-variables" "^7.24.7"+ "@babel/helper-module-transforms" "^7.24.7"+ "@babel/helper-plugin-utils" "^7.24.7"+ "@babel/helper-validator-identifier" "^7.24.7"-"@babel/plugin-transform-modules-umd@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.6.tgz#c4ef8b6d4da230b8dc87e81cd66986728952f89b"- integrity sha512-esRCC/KsSEUvrSjv5rFYnjZI6qv4R1e/iHQrqwbZIoRJqk7xCvEUiN7L1XrmW5QSmQe3n1XD88wbgDTWLbVSyg==+"@babel/plugin-transform-modules-umd@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz#edd9f43ec549099620df7df24e7ba13b5c76efc8"+ integrity sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==dependencies:- "@babel/helper-module-transforms" "^7.24.6"- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-module-transforms" "^7.24.7"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-transform-named-capturing-groups-regex@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.6.tgz#352ee2861ab8705320029f80238cf26a92ba65d5"- integrity sha512-6DneiCiu91wm3YiNIGDWZsl6GfTTbspuj/toTEqLh9d4cx50UIzSdg+T96p8DuT7aJOBRhFyaE9ZvTHkXrXr6Q==+"@babel/plugin-transform-named-capturing-groups-regex@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz#9042e9b856bc6b3688c0c2e4060e9e10b1460923"+ integrity sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==dependencies:- "@babel/helper-create-regexp-features-plugin" "^7.24.6"- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-create-regexp-features-plugin" "^7.24.7"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-transform-new-target@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.6.tgz#fc024294714705113720d5e3dc0f9ad7abdbc289"- integrity sha512-f8liz9JG2Va8A4J5ZBuaSdwfPqN6axfWRK+y66fjKYbwf9VBLuq4WxtinhJhvp1w6lamKUwLG0slK2RxqFgvHA==+"@babel/plugin-transform-new-target@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz#31ff54c4e0555cc549d5816e4ab39241dfb6ab00"+ integrity sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-transform-nullish-coalescing-operator@^7.22.11", "@babel/plugin-transform-nullish-coalescing-operator@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.6.tgz#12b83b3cdfd1cd2066350e36e4fb912ab194545e"- integrity sha512-+QlAiZBMsBK5NqrBWFXCYeXyiU1y7BQ/OYaiPAcQJMomn5Tyg+r5WuVtyEuvTbpV7L25ZSLfE+2E9ywj4FD48A==+"@babel/plugin-transform-nullish-coalescing-operator@^7.22.11", "@babel/plugin-transform-nullish-coalescing-operator@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz#1de4534c590af9596f53d67f52a92f12db984120"+ integrity sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7""@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"-"@babel/plugin-transform-numeric-separator@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.6.tgz#d9115669cc85aa91fbfb15f88f2226332cf4946a"- integrity sha512-6voawq8T25Jvvnc4/rXcWZQKKxUNZcKMS8ZNrjxQqoRFernJJKjE3s18Qo6VFaatG5aiX5JV1oPD7DbJhn0a4Q==+"@babel/plugin-transform-numeric-separator@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz#bea62b538c80605d8a0fac9b40f48e97efa7de63"+ integrity sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7""@babel/plugin-syntax-numeric-separator" "^7.10.4"-"@babel/plugin-transform-object-rest-spread@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.6.tgz#68d763f69955f9e599c405c6c876f5be46b47d8a"- integrity sha512-OKmi5wiMoRW5Smttne7BwHM8s/fb5JFs+bVGNSeHWzwZkWXWValR1M30jyXo1s/RaqgwwhEC62u4rFH/FBcBPg==+"@babel/plugin-transform-object-rest-spread@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz#d13a2b93435aeb8a197e115221cab266ba6e55d6"+ integrity sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q==dependencies:- "@babel/helper-compilation-targets" "^7.24.6"- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-compilation-targets" "^7.24.7"+ "@babel/helper-plugin-utils" "^7.24.7""@babel/plugin-syntax-object-rest-spread" "^7.8.3"- "@babel/plugin-transform-parameters" "^7.24.6"+ "@babel/plugin-transform-parameters" "^7.24.7"-"@babel/plugin-transform-object-super@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.6.tgz#9cbe6f995bed343a7ab8daf0416dac057a9c3e27"- integrity sha512-N/C76ihFKlZgKfdkEYKtaRUtXZAgK7sOY4h2qrbVbVTXPrKGIi8aww5WGe/+Wmg8onn8sr2ut6FXlsbu/j6JHg==+"@babel/plugin-transform-object-super@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz#66eeaff7830bba945dd8989b632a40c04ed625be"+ integrity sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"- "@babel/helper-replace-supers" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"+ "@babel/helper-replace-supers" "^7.24.7"-"@babel/plugin-transform-optional-catch-binding@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.6.tgz#c81e90a971aad898e56f2b75a358e6c4855aeba3"- integrity sha512-L5pZ+b3O1mSzJ71HmxSCmTVd03VOT2GXOigug6vDYJzE5awLI7P1g0wFcdmGuwSDSrQ0L2rDOe/hHws8J1rv3w==+"@babel/plugin-transform-optional-catch-binding@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz#00eabd883d0dd6a60c1c557548785919b6e717b4"+ integrity sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7""@babel/plugin-syntax-optional-catch-binding" "^7.8.3"-"@babel/plugin-transform-optional-chaining@^7.23.0", "@babel/plugin-transform-optional-chaining@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.6.tgz#3d636b3ed8b5a506f93e4d4675fc95754d7594f5"- integrity sha512-cHbqF6l1QP11OkYTYQ+hhVx1E017O5ZcSPXk9oODpqhcAD1htsWG2NpHrrhthEO2qZomLK0FXS+u7NfrkF5aOQ==+"@babel/plugin-transform-optional-chaining@^7.23.0", "@babel/plugin-transform-optional-chaining@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.7.tgz#b8f6848a80cf2da98a8a204429bec04756c6d454"+ integrity sha512-tK+0N9yd4j+x/4hxF3F0e0fu/VdcxU18y5SevtyM/PCFlQvXbR0Zmlo2eBrKtVipGNFzpq56o8WsIIKcJFUCRQ==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"- "@babel/helper-skip-transparent-expression-wrappers" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"+ "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7""@babel/plugin-syntax-optional-chaining" "^7.8.3"-"@babel/plugin-transform-parameters@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.6.tgz#7aee86dfedd2fc0136fecbe6f7649fc02d86ab22"- integrity sha512-ST7guE8vLV+vI70wmAxuZpIKzVjvFX9Qs8bl5w6tN/6gOypPWUmMQL2p7LJz5E63vEGrDhAiYetniJFyBH1RkA==+"@babel/plugin-transform-parameters@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz#5881f0ae21018400e320fc7eb817e529d1254b68"+ integrity sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-transform-private-methods@^7.22.5", "@babel/plugin-transform-private-methods@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.6.tgz#258e1f859a52ff7b30ad556598224c192defcda7"- integrity sha512-T9LtDI0BgwXOzyXrvgLTT8DFjCC/XgWLjflczTLXyvxbnSR/gpv0hbmzlHE/kmh9nOvlygbamLKRo6Op4yB6aw==+"@babel/plugin-transform-private-methods@^7.22.5", "@babel/plugin-transform-private-methods@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.7.tgz#e6318746b2ae70a59d023d5cc1344a2ba7a75f5e"+ integrity sha512-COTCOkG2hn4JKGEKBADkA8WNb35TGkkRbI5iT845dB+NyqgO8Hn+ajPbSnIQznneJTa3d30scb6iz/DhH8GsJQ==dependencies:- "@babel/helper-create-class-features-plugin" "^7.24.6"- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-create-class-features-plugin" "^7.24.7"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-transform-private-property-in-object@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.6.tgz#59ff09a099f62213112cf348e96b6b11957d1f28"- integrity sha512-Qu/ypFxCY5NkAnEhCF86Mvg3NSabKsh/TPpBVswEdkGl7+FbsYHy1ziRqJpwGH4thBdQHh8zx+z7vMYmcJ7iaQ==+"@babel/plugin-transform-private-property-in-object@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz#4eec6bc701288c1fab5f72e6a4bbc9d67faca061"+ integrity sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==dependencies:- "@babel/helper-annotate-as-pure" "^7.24.6"- "@babel/helper-create-class-features-plugin" "^7.24.6"- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-annotate-as-pure" "^7.24.7"+ "@babel/helper-create-class-features-plugin" "^7.24.7"+ "@babel/helper-plugin-utils" "^7.24.7""@babel/plugin-syntax-private-property-in-object" "^7.14.5"-"@babel/plugin-transform-property-literals@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.6.tgz#243c4faabe811c405e9443059a58e834bf95dfd1"- integrity sha512-oARaglxhRsN18OYsnPTpb8TcKQWDYNsPNmTnx5++WOAsUJ0cSC/FZVlIJCKvPbU4yn/UXsS0551CFKJhN0CaMw==+"@babel/plugin-transform-property-literals@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz#f0d2ed8380dfbed949c42d4d790266525d63bbdc"+ integrity sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-transform-regenerator@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.6.tgz#ed10cf0c13619365e15459f88d1b915ac57ffc24"- integrity sha512-SMDxO95I8WXRtXhTAc8t/NFQUT7VYbIWwJCJgEli9ml4MhqUMh4S6hxgH6SmAC3eAQNWCDJFxcFeEt9w2sDdXg==+"@babel/plugin-transform-regenerator@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz#021562de4534d8b4b1851759fd7af4e05d2c47f8"+ integrity sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"regenerator-transform "^0.15.2"-"@babel/plugin-transform-reserved-words@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.6.tgz#9eb16cbf339fcea0a46677716c775afb5ef14245"- integrity sha512-DcrgFXRRlK64dGE0ZFBPD5egM2uM8mgfrvTMOSB2yKzOtjpGegVYkzh3s1zZg1bBck3nkXiaOamJUqK3Syk+4A==+"@babel/plugin-transform-reserved-words@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz#80037fe4fbf031fc1125022178ff3938bb3743a4"+ integrity sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-transform-shorthand-properties@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.6.tgz#ef734ebccc428d2174c7bb36015d0800faf5381e"- integrity sha512-xnEUvHSMr9eOWS5Al2YPfc32ten7CXdH7Zwyyk7IqITg4nX61oHj+GxpNvl+y5JHjfN3KXE2IV55wAWowBYMVw==+"@babel/plugin-transform-shorthand-properties@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz#85448c6b996e122fa9e289746140aaa99da64e73"+ integrity sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-transform-spread@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.6.tgz#a56cecbd8617675531d1b79f5b755b7613aa0822"- integrity sha512-h/2j7oIUDjS+ULsIrNZ6/TKG97FgmEk1PXryk/HQq6op4XUUUwif2f69fJrzK0wza2zjCS1xhXmouACaWV5uPA==+"@babel/plugin-transform-spread@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz#e8a38c0fde7882e0fb8f160378f74bd885cc7bb3"+ integrity sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"- "@babel/helper-skip-transparent-expression-wrappers" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"+ "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"-"@babel/plugin-transform-sticky-regex@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.6.tgz#1a78127731fea87d954bed193840986a38f04327"- integrity sha512-fN8OcTLfGmYv7FnDrsjodYBo1DhPL3Pze/9mIIE2MGCT1KgADYIOD7rEglpLHZj8PZlC/JFX5WcD+85FLAQusw==+"@babel/plugin-transform-sticky-regex@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz#96ae80d7a7e5251f657b5cf18f1ea6bf926f5feb"+ integrity sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-transform-template-literals@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.6.tgz#aaf2ae157acd0e5c9265dba8ac0a439f8d2a6303"- integrity sha512-BJbEqJIcKwrqUP+KfUIkxz3q8VzXe2R8Wv8TaNgO1cx+nNavxn/2+H8kp9tgFSOL6wYPPEgFvU6IKS4qoGqhmg==+"@babel/plugin-transform-template-literals@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz#a05debb4a9072ae8f985bcf77f3f215434c8f8c8"+ integrity sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-transform-typeof-symbol@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.6.tgz#3d02da23ebcc8f1982ddcd1f2581cf3ee4e58762"- integrity sha512-IshCXQ+G9JIFJI7bUpxTE/oA2lgVLAIK8q1KdJNoPXOpvRaNjMySGuvLfBw/Xi2/1lLo953uE8hyYSDW3TSYig==+"@babel/plugin-transform-typeof-symbol@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.7.tgz#f074be466580d47d6e6b27473a840c9f9ca08fb0"+ integrity sha512-VtR8hDy7YLB7+Pet9IarXjg/zgCMSF+1mNS/EQEiEaUPoFXCVsHG64SIxcaaI2zJgRiv+YmgaQESUfWAdbjzgg==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-transform-typescript@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.6.tgz#339c6127a783c32e28a5b591e6c666f899b57db0"- integrity sha512-H0i+hDLmaYYSt6KU9cZE0gb3Cbssa/oxWis7PX4ofQzbvsfix9Lbh8SRk7LCPDlLWJHUiFeHU0qRRpF/4Zv7mQ==+"@babel/plugin-transform-typescript@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.7.tgz#b006b3e0094bf0813d505e0c5485679eeaf4a881"+ integrity sha512-iLD3UNkgx2n/HrjBesVbYX6j0yqn/sJktvbtKKgcaLIQ4bTTQ8obAypc1VpyHPD2y4Phh9zHOaAt8e/L14wCpw==dependencies:- "@babel/helper-annotate-as-pure" "^7.24.6"- "@babel/helper-create-class-features-plugin" "^7.24.6"- "@babel/helper-plugin-utils" "^7.24.6"- "@babel/plugin-syntax-typescript" "^7.24.6"+ "@babel/helper-annotate-as-pure" "^7.24.7"+ "@babel/helper-create-class-features-plugin" "^7.24.7"+ "@babel/helper-plugin-utils" "^7.24.7"+ "@babel/plugin-syntax-typescript" "^7.24.7"-"@babel/plugin-transform-unicode-escapes@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.6.tgz#c8ddca8fd5bacece837a4e27bd3b7ed64580d1a8"- integrity sha512-bKl3xxcPbkQQo5eX9LjjDpU2xYHeEeNQbOhj0iPvetSzA+Tu9q/o5lujF4Sek60CM6MgYvOS/DJuwGbiEYAnLw==+"@babel/plugin-transform-unicode-escapes@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz#2023a82ced1fb4971630a2e079764502c4148e0e"+ integrity sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-transform-unicode-property-regex@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.6.tgz#e66297d5d452db0b0be56515e3d0e10b7d33fb32"- integrity sha512-8EIgImzVUxy15cZiPii9GvLZwsy7Vxc+8meSlR3cXFmBIl5W5Tn9LGBf7CDKkHj4uVfNXCJB8RsVfnmY61iedA==+"@babel/plugin-transform-unicode-property-regex@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz#9073a4cd13b86ea71c3264659590ac086605bbcd"+ integrity sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==dependencies:- "@babel/helper-create-regexp-features-plugin" "^7.24.6"- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-create-regexp-features-plugin" "^7.24.7"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-transform-unicode-regex@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.6.tgz#2001e7d87ed709eea145e0b65fb5f93c3c0e225b"- integrity sha512-pssN6ExsvxaKU638qcWb81RrvvgZom3jDgU/r5xFZ7TONkZGFf4MhI2ltMb8OcQWhHyxgIavEU+hgqtbKOmsPA==+"@babel/plugin-transform-unicode-regex@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz#dfc3d4a51127108099b19817c0963be6a2adf19f"+ integrity sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==dependencies:- "@babel/helper-create-regexp-features-plugin" "^7.24.6"- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-create-regexp-features-plugin" "^7.24.7"+ "@babel/helper-plugin-utils" "^7.24.7"-"@babel/plugin-transform-unicode-sets-regex@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.6.tgz#f18b7292222aee85c155258ceb345a146a070a46"- integrity sha512-quiMsb28oXWIDK0gXLALOJRXLgICLiulqdZGOaPPd0vRT7fQp74NtdADAVu+D8s00C+0Xs0MxVP0VKF/sZEUgw==+"@babel/plugin-transform-unicode-sets-regex@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.7.tgz#d40705d67523803a576e29c63cef6e516b858ed9"+ integrity sha512-2G8aAvF4wy1w/AGZkemprdGMRg5o6zPNhbHVImRz3lss55TYCBd6xStN19rt8XJHq20sqV0JbyWjOWwQRwV/wg==dependencies:- "@babel/helper-create-regexp-features-plugin" "^7.24.6"- "@babel/helper-plugin-utils" "^7.24.6"+ "@babel/helper-create-regexp-features-plugin" "^7.24.7"+ "@babel/helper-plugin-utils" "^7.24.7""@babel/preset-env@^7.11.0", "@babel/preset-env@^7.24.4":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.24.6.tgz#a5a55bc70e5ff1ed7f872067e2a9d65ff917ad6f"- integrity sha512-CrxEAvN7VxfjOG8JNF2Y/eMqMJbZPZ185amwGUBp8D9USK90xQmv7dLdFSa+VbD7fdIqcy/Mfv7WtzG8+/qxKg==- dependencies:- "@babel/compat-data" "^7.24.6"- "@babel/helper-compilation-targets" "^7.24.6"- "@babel/helper-plugin-utils" "^7.24.6"- "@babel/helper-validator-option" "^7.24.6"- "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.24.6"- "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.24.6"- "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.24.6"- "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.24.6"+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.24.7.tgz#ff067b4e30ba4a72f225f12f123173e77b987f37"+ integrity sha512-1YZNsc+y6cTvWlDHidMBsQZrZfEFjRIo/BZCT906PMdzOyXtSLTgqGdrpcuTDCXyd11Am5uQULtDIcCfnTc8fQ==+ dependencies:+ "@babel/compat-data" "^7.24.7"+ "@babel/helper-compilation-targets" "^7.24.7"+ "@babel/helper-plugin-utils" "^7.24.7"+ "@babel/helper-validator-option" "^7.24.7"+ "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.24.7"+ "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.24.7"+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.24.7"+ "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.24.7""@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2""@babel/plugin-syntax-async-generators" "^7.8.4""@babel/plugin-syntax-class-properties" "^7.12.13""@babel/plugin-syntax-class-static-block" "^7.14.5""@babel/plugin-syntax-dynamic-import" "^7.8.3""@babel/plugin-syntax-export-namespace-from" "^7.8.3"- "@babel/plugin-syntax-import-assertions" "^7.24.6"- "@babel/plugin-syntax-import-attributes" "^7.24.6"+ "@babel/plugin-syntax-import-assertions" "^7.24.7"+ "@babel/plugin-syntax-import-attributes" "^7.24.7""@babel/plugin-syntax-import-meta" "^7.10.4""@babel/plugin-syntax-json-strings" "^7.8.3""@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"@@ -930,54 +938,54 @@"@babel/plugin-syntax-private-property-in-object" "^7.14.5""@babel/plugin-syntax-top-level-await" "^7.14.5""@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"- "@babel/plugin-transform-arrow-functions" "^7.24.6"- "@babel/plugin-transform-async-generator-functions" "^7.24.6"- "@babel/plugin-transform-async-to-generator" "^7.24.6"- "@babel/plugin-transform-block-scoped-functions" "^7.24.6"- "@babel/plugin-transform-block-scoping" "^7.24.6"- "@babel/plugin-transform-class-properties" "^7.24.6"- "@babel/plugin-transform-class-static-block" "^7.24.6"- "@babel/plugin-transform-classes" "^7.24.6"- "@babel/plugin-transform-computed-properties" "^7.24.6"- "@babel/plugin-transform-destructuring" "^7.24.6"- "@babel/plugin-transform-dotall-regex" "^7.24.6"- "@babel/plugin-transform-duplicate-keys" "^7.24.6"- "@babel/plugin-transform-dynamic-import" "^7.24.6"- "@babel/plugin-transform-exponentiation-operator" "^7.24.6"- "@babel/plugin-transform-export-namespace-from" "^7.24.6"- "@babel/plugin-transform-for-of" "^7.24.6"- "@babel/plugin-transform-function-name" "^7.24.6"- "@babel/plugin-transform-json-strings" "^7.24.6"- "@babel/plugin-transform-literals" "^7.24.6"- "@babel/plugin-transform-logical-assignment-operators" "^7.24.6"- "@babel/plugin-transform-member-expression-literals" "^7.24.6"- "@babel/plugin-transform-modules-amd" "^7.24.6"- "@babel/plugin-transform-modules-commonjs" "^7.24.6"- "@babel/plugin-transform-modules-systemjs" "^7.24.6"- "@babel/plugin-transform-modules-umd" "^7.24.6"- "@babel/plugin-transform-named-capturing-groups-regex" "^7.24.6"- "@babel/plugin-transform-new-target" "^7.24.6"- "@babel/plugin-transform-nullish-coalescing-operator" "^7.24.6"- "@babel/plugin-transform-numeric-separator" "^7.24.6"- "@babel/plugin-transform-object-rest-spread" "^7.24.6"- "@babel/plugin-transform-object-super" "^7.24.6"- "@babel/plugin-transform-optional-catch-binding" "^7.24.6"- "@babel/plugin-transform-optional-chaining" "^7.24.6"- "@babel/plugin-transform-parameters" "^7.24.6"- "@babel/plugin-transform-private-methods" "^7.24.6"- "@babel/plugin-transform-private-property-in-object" "^7.24.6"- "@babel/plugin-transform-property-literals" "^7.24.6"- "@babel/plugin-transform-regenerator" "^7.24.6"- "@babel/plugin-transform-reserved-words" "^7.24.6"- "@babel/plugin-transform-shorthand-properties" "^7.24.6"- "@babel/plugin-transform-spread" "^7.24.6"- "@babel/plugin-transform-sticky-regex" "^7.24.6"- "@babel/plugin-transform-template-literals" "^7.24.6"- "@babel/plugin-transform-typeof-symbol" "^7.24.6"- "@babel/plugin-transform-unicode-escapes" "^7.24.6"- "@babel/plugin-transform-unicode-property-regex" "^7.24.6"- "@babel/plugin-transform-unicode-regex" "^7.24.6"- "@babel/plugin-transform-unicode-sets-regex" "^7.24.6"+ "@babel/plugin-transform-arrow-functions" "^7.24.7"+ "@babel/plugin-transform-async-generator-functions" "^7.24.7"+ "@babel/plugin-transform-async-to-generator" "^7.24.7"+ "@babel/plugin-transform-block-scoped-functions" "^7.24.7"+ "@babel/plugin-transform-block-scoping" "^7.24.7"+ "@babel/plugin-transform-class-properties" "^7.24.7"+ "@babel/plugin-transform-class-static-block" "^7.24.7"+ "@babel/plugin-transform-classes" "^7.24.7"+ "@babel/plugin-transform-computed-properties" "^7.24.7"+ "@babel/plugin-transform-destructuring" "^7.24.7"+ "@babel/plugin-transform-dotall-regex" "^7.24.7"+ "@babel/plugin-transform-duplicate-keys" "^7.24.7"+ "@babel/plugin-transform-dynamic-import" "^7.24.7"+ "@babel/plugin-transform-exponentiation-operator" "^7.24.7"+ "@babel/plugin-transform-export-namespace-from" "^7.24.7"+ "@babel/plugin-transform-for-of" "^7.24.7"+ "@babel/plugin-transform-function-name" "^7.24.7"+ "@babel/plugin-transform-json-strings" "^7.24.7"+ "@babel/plugin-transform-literals" "^7.24.7"+ "@babel/plugin-transform-logical-assignment-operators" "^7.24.7"+ "@babel/plugin-transform-member-expression-literals" "^7.24.7"+ "@babel/plugin-transform-modules-amd" "^7.24.7"+ "@babel/plugin-transform-modules-commonjs" "^7.24.7"+ "@babel/plugin-transform-modules-systemjs" "^7.24.7"+ "@babel/plugin-transform-modules-umd" "^7.24.7"+ "@babel/plugin-transform-named-capturing-groups-regex" "^7.24.7"+ "@babel/plugin-transform-new-target" "^7.24.7"+ "@babel/plugin-transform-nullish-coalescing-operator" "^7.24.7"+ "@babel/plugin-transform-numeric-separator" "^7.24.7"+ "@babel/plugin-transform-object-rest-spread" "^7.24.7"+ "@babel/plugin-transform-object-super" "^7.24.7"+ "@babel/plugin-transform-optional-catch-binding" "^7.24.7"+ "@babel/plugin-transform-optional-chaining" "^7.24.7"+ "@babel/plugin-transform-parameters" "^7.24.7"+ "@babel/plugin-transform-private-methods" "^7.24.7"+ "@babel/plugin-transform-private-property-in-object" "^7.24.7"+ "@babel/plugin-transform-property-literals" "^7.24.7"+ "@babel/plugin-transform-regenerator" "^7.24.7"+ "@babel/plugin-transform-reserved-words" "^7.24.7"+ "@babel/plugin-transform-shorthand-properties" "^7.24.7"+ "@babel/plugin-transform-spread" "^7.24.7"+ "@babel/plugin-transform-sticky-regex" "^7.24.7"+ "@babel/plugin-transform-template-literals" "^7.24.7"+ "@babel/plugin-transform-typeof-symbol" "^7.24.7"+ "@babel/plugin-transform-unicode-escapes" "^7.24.7"+ "@babel/plugin-transform-unicode-property-regex" "^7.24.7"+ "@babel/plugin-transform-unicode-regex" "^7.24.7"+ "@babel/plugin-transform-unicode-sets-regex" "^7.24.7""@babel/preset-modules" "0.1.6-no-external-plugins"babel-plugin-polyfill-corejs2 "^0.4.10"babel-plugin-polyfill-corejs3 "^0.10.4"@@ -986,13 +994,13 @@semver "^6.3.1""@babel/preset-flow@^7.22.15":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.24.6.tgz#df09ee46558577bea49bc71d597604c03c9bf7a6"- integrity sha512-huoe0T1Qs9fQhMWbmqE/NHUeZbqmHDsN6n/jYvPcUUHfuKiPV32C9i8tDhMbQ1DEKTjbBP7Rjm3nSLwlB2X05g==+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.24.7.tgz#eef5cb8e05e97a448fc50c16826f5612fe512c06"+ integrity sha512-NL3Lo0NorCU607zU3NwRyJbpaB6E3t0xtd3LfAQKDfkeX4/ggcDXvkmkW42QWT5owUeW/jAe4hn+2qvkV1IbfQ==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"- "@babel/helper-validator-option" "^7.24.6"- "@babel/plugin-transform-flow-strip-types" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"+ "@babel/helper-validator-option" "^7.24.7"+ "@babel/plugin-transform-flow-strip-types" "^7.24.7""@babel/[email protected]":version "0.1.6-no-external-plugins"@@ -1004,15 +1012,15 @@esutils "^2.0.2""@babel/preset-typescript@^7.23.0":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.24.6.tgz#27057470fb981c31338bdb897fc3d9aa0cb7dab2"- integrity sha512-U10aHPDnokCFRXgyT/MaIRTivUu2K/mu0vJlwRS9LxJmJet+PFQNKpggPyFCUtC6zWSBPjvxjnpNkAn3Uw2m5w==+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.24.7.tgz#66cd86ea8f8c014855671d5ea9a737139cbbfef1"+ integrity sha512-SyXRe3OdWwIwalxDg5UtJnJQO+YPcTfwiIY2B0Xlddh9o7jpWLvv8X1RthIeDOxQ+O1ML5BLPCONToObyVQVuQ==dependencies:- "@babel/helper-plugin-utils" "^7.24.6"- "@babel/helper-validator-option" "^7.24.6"- "@babel/plugin-syntax-jsx" "^7.24.6"- "@babel/plugin-transform-modules-commonjs" "^7.24.6"- "@babel/plugin-transform-typescript" "^7.24.6"+ "@babel/helper-plugin-utils" "^7.24.7"+ "@babel/helper-validator-option" "^7.24.7"+ "@babel/plugin-syntax-jsx" "^7.24.7"+ "@babel/plugin-transform-modules-commonjs" "^7.24.7"+ "@babel/plugin-transform-typescript" "^7.24.7""@babel/register@^7.22.15":version "7.24.6"@@ -1031,44 +1039,44 @@integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.3", "@babel/runtime@^7.21.0", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.9", "@babel/runtime@^7.24.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.6.tgz#5b76eb89ad45e2e4a0a8db54c456251469a3358e"- integrity sha512-Ja18XcETdEl5mzzACGd+DKgaGJzPTCow7EglgwTmHdwokzDFYh/MHua6lU6DV/hjF2IaOJ4oX2nqnjG7RElKOw==+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.7.tgz#f4f0d5530e8dbdf59b3451b9b3e594b6ba082e12"+ integrity sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==dependencies:regenerator-runtime "^0.14.0"-"@babel/template@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.24.6.tgz#048c347b2787a6072b24c723664c8d02b67a44f9"- integrity sha512-3vgazJlLwNXi9jhrR1ef8qiB65L1RK90+lEQwv4OxveHnqC3BfmnHdgySwRLzf6akhlOYenT+b7AfWq+a//AHw==- dependencies:- "@babel/code-frame" "^7.24.6"- "@babel/parser" "^7.24.6"- "@babel/types" "^7.24.6"--"@babel/traverse@^7.18.9", "@babel/traverse@^7.24.1", "@babel/traverse@^7.24.6":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.6.tgz#0941ec50cdeaeacad0911eb67ae227a4f8424edc"- integrity sha512-OsNjaJwT9Zn8ozxcfoBc+RaHdj3gFmCmYoQLUII1o6ZrUwku0BMg80FoOTPx+Gi6XhcQxAYE4xyjPTo4SxEQqw==- dependencies:- "@babel/code-frame" "^7.24.6"- "@babel/generator" "^7.24.6"- "@babel/helper-environment-visitor" "^7.24.6"- "@babel/helper-function-name" "^7.24.6"- "@babel/helper-hoist-variables" "^7.24.6"- "@babel/helper-split-export-declaration" "^7.24.6"- "@babel/parser" "^7.24.6"- "@babel/types" "^7.24.6"+"@babel/template@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.24.7.tgz#02efcee317d0609d2c07117cb70ef8fb17ab7315"+ integrity sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==+ dependencies:+ "@babel/code-frame" "^7.24.7"+ "@babel/parser" "^7.24.7"+ "@babel/types" "^7.24.7"++"@babel/traverse@^7.18.9", "@babel/traverse@^7.24.1", "@babel/traverse@^7.24.7":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.7.tgz#de2b900163fa741721ba382163fe46a936c40cf5"+ integrity sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==+ dependencies:+ "@babel/code-frame" "^7.24.7"+ "@babel/generator" "^7.24.7"+ "@babel/helper-environment-visitor" "^7.24.7"+ "@babel/helper-function-name" "^7.24.7"+ "@babel/helper-hoist-variables" "^7.24.7"+ "@babel/helper-split-export-declaration" "^7.24.7"+ "@babel/parser" "^7.24.7"+ "@babel/types" "^7.24.7"debug "^4.3.1"globals "^11.1.0"-"@babel/types@^7.0.0", "@babel/types@^7.18.9", "@babel/types@^7.20.7", "@babel/types@^7.24.0", "@babel/types@^7.24.6", "@babel/types@^7.4.4":- version "7.24.6"- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.6.tgz#ba4e1f59870c10dc2fa95a274ac4feec23b21912"- integrity sha512-WaMsgi6Q8zMgMth93GvWPXkhAIEobfsIkLTacoVZoK1J0CevIPGYY2Vo5YvJGqyHqXM6P4ppOYGsIRU8MM9pFQ==+"@babel/types@^7.0.0", "@babel/types@^7.18.9", "@babel/types@^7.20.7", "@babel/types@^7.24.0", "@babel/types@^7.24.7", "@babel/types@^7.4.4":+ version "7.24.7"+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.7.tgz#6027fe12bc1aa724cd32ab113fb7f1988f1f66f2"+ integrity sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==dependencies:- "@babel/helper-string-parser" "^7.24.6"- "@babel/helper-validator-identifier" "^7.24.6"+ "@babel/helper-string-parser" "^7.24.7"+ "@babel/helper-validator-identifier" "^7.24.7"to-fast-properties "^2.0.0""@base2/[email protected]":@@ -1578,7 +1586,7 @@dependencies:"@floating-ui/dom" "^1.0.0"-"@floating-ui/react@^0.26.4":+"@floating-ui/react@^0.26.13", "@floating-ui/react@^0.26.4":version "0.26.16"resolved "https://registry.yarnpkg.com/@floating-ui/react/-/react-0.26.16.tgz#3415a087f452165161c2d313d1d57e8142894679"integrity sha512-HEf43zxZNAI/E781QIVpYSF3K2VH4TTYZpqecjdsFkjsaU1EbaWcM++kw0HXFffj7gDUcBFevX8s0rQGQpxkow==@@ -1592,7 +1600,7 @@resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.2.tgz#d8bae93ac8b815b2bd7a98078cf91e2724ef11e5"integrity sha512-J4yDIIthosAsRZ5CPYP/jQvUAQtlZTTD/4suA08/FEnlxqW3sKS9iAhgsa9VYLZ6vDHn/ixJgIqRQPotoBjxIw==-"@headlessui/react@^1.7.13", "@headlessui/react@^1.7.17", "@headlessui/react@^1.7.19", "@headlessui/react@^1.7.3":+"@headlessui/react@^1.7.13", "@headlessui/react@^1.7.19", "@headlessui/react@^1.7.3":version "1.7.19"resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-1.7.19.tgz#91c78cf5fcb254f4a0ebe96936d48421caf75f40"integrity sha512-Ll+8q3OlMJfJbAKM/+/Y2q6PPYbryqNTXDbryx7SXLIDamkF6iQFbriYHga0dY44PvDhvvBWCx1Xj4U5+G4hOw==@@ -1600,6 +1608,16 @@"@tanstack/react-virtual" "^3.0.0-beta.60"client-only "^0.0.1"+"@headlessui/react@^2.0.3":+ version "2.0.4"+ resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-2.0.4.tgz#46cb39ca9dde3c2d15f4706c81dad78405b608f0"+ integrity sha512-16d/rOLeYsFsmPlRmXGu8DCBzrWD0zV1Ccx3n73wN87yFu8Y9+X04zflv8EJEt9TAYRyLKOmQXUnOnqQl6NgpA==+ dependencies:+ "@floating-ui/react" "^0.26.13"+ "@react-aria/focus" "^3.16.2"+ "@react-aria/interactions" "^3.21.1"+ "@tanstack/react-virtual" "3.5.0"+"@humanwhocodes/config-array@^0.11.14":version "0.11.14"resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"@@ -2044,22 +2062,29 @@"@opentelemetry/api" "^1.0.0""@opentelemetry/api@^1.0.0", "@opentelemetry/api@^1.6.0", "@opentelemetry/api@^1.8", "@opentelemetry/api@^1.8.0":- version "1.8.0"- resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.8.0.tgz#5aa7abb48f23f693068ed2999ae627d2f7d902ec"- integrity sha512-I/s6F7yKUDdtMsoBWXJe8Qz40Tui5vsuKCWJEWVL+5q9sSWRzzx6v2KeNsOBEwd94j0eWkpWCH4yB6rZg9Mf0w==+ version "1.9.0"+ resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.9.0.tgz#d03eba68273dc0f7509e2a3d5cba21eae10379fe"+ integrity sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg=="@opentelemetry/context-async-hooks@^1.24.1":- version "1.24.1"- resolved "https://registry.yarnpkg.com/@opentelemetry/context-async-hooks/-/context-async-hooks-1.24.1.tgz#1db7116d78f60e993e0d337bd497885a53deba1a"- integrity sha512-R5r6DO4kgEOVBxFXhXjwospLQkv+sYxwCfjvoZBe7Zm6KKXAV9kDSJhi/D1BweowdZmO+sdbENLs374gER8hpQ==+ version "1.25.0"+ resolved "https://registry.yarnpkg.com/@opentelemetry/context-async-hooks/-/context-async-hooks-1.25.0.tgz#bc3dcb1302b34b0f56047dd0d0f56b33013f657f"+ integrity sha512-sBW313mnMyFg0cp/40BRzrZBWG+581s2j5gIsa5fgGadswyILk4mNFATsqrCOpAx945RDuZ2B7ThQLgor9OpfA==-"@opentelemetry/[email protected]", "@opentelemetry/core@^1.1.0", "@opentelemetry/core@^1.24.1", "@opentelemetry/core@^1.8.0":+"@opentelemetry/[email protected]":version "1.24.1"resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.24.1.tgz#35ab9d2ac9ca938e0ffbdfa40c49c169ac8ba80d"integrity sha512-wMSGfsdmibI88K9wB498zXY04yThPexo8jvwNNlm542HZB7XrrMRBbAyKJqG8qDRJwIBdBrPMi4V9ZPW/sqrcg==dependencies:"@opentelemetry/semantic-conventions" "1.24.1"+"@opentelemetry/[email protected]", "@opentelemetry/core@^1.1.0", "@opentelemetry/core@^1.24.1", "@opentelemetry/core@^1.8.0":+ version "1.25.0"+ resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.25.0.tgz#ad034f5c2669f589bd703bfbbaa38b51f8504053"+ integrity sha512-n0B3s8rrqGrasTgNkXLKXzN0fXo+6IYP7M5b7AMsrZM33f/y6DS6kJ0Btd7SespASWq8bgL3taLo0oe0vB52IQ==+ dependencies:+ "@opentelemetry/semantic-conventions" "1.25.0"+"@opentelemetry/[email protected]":version "0.36.1"resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-connect/-/instrumentation-connect-0.36.1.tgz#4ef93ade4c7224213d9e4411190c22d753166a18"@@ -2217,37 +2242,42 @@resolved "https://registry.yarnpkg.com/@opentelemetry/redis-common/-/redis-common-0.36.2.tgz#906ac8e4d804d4109f3ebd5c224ac988276fdc47"integrity sha512-faYX1N0gpLhej/6nyp6bgRjzAKXn5GOEMYY7YhciSfCoITAktLUtQ36d24QEWNA1/WA1y6qQunCe0OhHRkVl9g==-"@opentelemetry/[email protected]", "@opentelemetry/resources@^1.23.0":- version "1.24.1"- resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-1.24.1.tgz#5e2cb84814824f3b1e1017e6caeeee8402e0ad6e"- integrity sha512-cyv0MwAaPF7O86x5hk3NNgenMObeejZFLJJDVuSeSMIsknlsj3oOZzRv3qSzlwYomXsICfBeFFlxwHQte5mGXQ==+"@opentelemetry/[email protected]", "@opentelemetry/resources@^1.23.0":+ version "1.25.0"+ resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-1.25.0.tgz#84a1e70097e342aa2047aac97be114ad14966793"+ integrity sha512-iHjydPMYJ+Li1auveJCq2rp5U2h6Mhq8BidiyE0jfVlDTFyR1ny8AfJHfmFzJ/RAM8vT8L7T21kcmGybxZC7lQ==dependencies:- "@opentelemetry/core" "1.24.1"- "@opentelemetry/semantic-conventions" "1.24.1"+ "@opentelemetry/core" "1.25.0"+ "@opentelemetry/semantic-conventions" "1.25.0""@opentelemetry/sdk-metrics@^1.9.1":- version "1.24.1"- resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-metrics/-/sdk-metrics-1.24.1.tgz#82ee3069b2ca9bb7c1e91272ff81536dc2e9bc8d"- integrity sha512-FrAqCbbGao9iKI+Mgh+OsC9+U2YMoXnlDHe06yH7dvavCKzE3S892dGtX54+WhSFVxHR/TMRVJiK/CV93GR0TQ==+ version "1.25.0"+ resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-metrics/-/sdk-metrics-1.25.0.tgz#0c954d580c17821ae4385d29447718df09e80b79"+ integrity sha512-IF+Sv4VHgBr/BPMKabl+GouJIhEqAOexCHgXVTISdz3q9P9H/uA8ScCF+22gitQ69aFtESbdYOV+Fen5+avQng==dependencies:- "@opentelemetry/core" "1.24.1"- "@opentelemetry/resources" "1.24.1"+ "@opentelemetry/core" "1.25.0"+ "@opentelemetry/resources" "1.25.0"lodash.merge "^4.6.2""@opentelemetry/sdk-trace-base@^1.22", "@opentelemetry/sdk-trace-base@^1.23.0":- version "1.24.1"- resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.24.1.tgz#dc2ab89126e75e442913fb5af98803fde67b2536"- integrity sha512-zz+N423IcySgjihl2NfjBf0qw1RWe11XIAWVrTNOSSI6dtSPJiVom2zipFB2AEEtJWpv0Iz6DY6+TjnyTV5pWg==+ version "1.25.0"+ resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.25.0.tgz#263f9ce19001c5cd7a814d0eb40ebc6469ae763d"+ integrity sha512-6+g2fiRQUG39guCsKVeY8ToeuUf3YUnPkN6DXRA1qDmFLprlLvZm9cS6+chgbW70cZJ406FTtSCDnJwxDC5sGQ==dependencies:- "@opentelemetry/core" "1.24.1"- "@opentelemetry/resources" "1.24.1"- "@opentelemetry/semantic-conventions" "1.24.1"+ "@opentelemetry/core" "1.25.0"+ "@opentelemetry/resources" "1.25.0"+ "@opentelemetry/semantic-conventions" "1.25.0"-"@opentelemetry/[email protected]", "@opentelemetry/semantic-conventions@^1.0.0", "@opentelemetry/semantic-conventions@^1.17.0", "@opentelemetry/semantic-conventions@^1.22.0", "@opentelemetry/semantic-conventions@^1.23.0":+"@opentelemetry/[email protected]":version "1.24.1"resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.24.1.tgz#d4bcebda1cb5146d47a2a53daaa7922f8e084dfb"integrity sha512-VkliWlS4/+GHLLW7J/rVBA00uXus1SWvwFvcUDxDwmFxYfg/2VI6ekwdXS28cjI8Qz2ky2BzG8OUHo+WeYIWqw==+"@opentelemetry/[email protected]", "@opentelemetry/semantic-conventions@^1.0.0", "@opentelemetry/semantic-conventions@^1.17.0", "@opentelemetry/semantic-conventions@^1.22.0", "@opentelemetry/semantic-conventions@^1.23.0":+ version "1.25.0"+ resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.25.0.tgz#390eb4d42a29c66bdc30066af9035645e9bb7270"+ integrity sha512-M+kkXKRAIAiAP6qYyesfrC5TOmDpDVtsxuGfPcqd9B/iBrac+E14jYwrgm0yZBUIbIP2OnqC3j+UgkXLm1vxUQ==+"@opentelemetry/sql-common@^0.40.1":version "0.40.1"resolved "https://registry.yarnpkg.com/@opentelemetry/sql-common/-/sql-common-0.40.1.tgz#93fbc48d8017449f5b3c3274f2268a08af2b83b6"@@ -2421,6 +2451,45 @@dependencies:"@babel/runtime" "^7.13.10"+"@react-aria/focus@^3.16.2":+ version "3.17.1"+ resolved "https://registry.yarnpkg.com/@react-aria/focus/-/focus-3.17.1.tgz#c796a188120421e2fedf438cadacdf463c77ad29"+ integrity sha512-FLTySoSNqX++u0nWZJPPN5etXY0WBxaIe/YuL/GTEeuqUIuC/2bJSaw5hlsM6T2yjy6Y/VAxBcKSdAFUlU6njQ==+ dependencies:+ "@react-aria/interactions" "^3.21.3"+ "@react-aria/utils" "^3.24.1"+ "@react-types/shared" "^3.23.1"+ "@swc/helpers" "^0.5.0"+ clsx "^2.0.0"++"@react-aria/interactions@^3.21.1", "@react-aria/interactions@^3.21.3":+ version "3.21.3"+ resolved "https://registry.yarnpkg.com/@react-aria/interactions/-/interactions-3.21.3.tgz#a2a3e354a8b894bed7a46e1143453f397f2538d7"+ integrity sha512-BWIuf4qCs5FreDJ9AguawLVS0lV9UU+sK4CCnbCNNmYqOWY+1+gRXCsnOM32K+oMESBxilAjdHW5n1hsMqYMpA==+ dependencies:+ "@react-aria/ssr" "^3.9.4"+ "@react-aria/utils" "^3.24.1"+ "@react-types/shared" "^3.23.1"+ "@swc/helpers" "^0.5.0"++"@react-aria/ssr@^3.9.4":+ version "3.9.4"+ resolved "https://registry.yarnpkg.com/@react-aria/ssr/-/ssr-3.9.4.tgz#9da8b10342c156e816dbfa4c9e713b21f274d7ab"+ integrity sha512-4jmAigVq409qcJvQyuorsmBR4+9r3+JEC60wC+Y0MZV0HCtTmm8D9guYXlJMdx0SSkgj0hHAyFm/HvPNFofCoQ==+ dependencies:+ "@swc/helpers" "^0.5.0"++"@react-aria/utils@^3.24.1":+ version "3.24.1"+ resolved "https://registry.yarnpkg.com/@react-aria/utils/-/utils-3.24.1.tgz#9d16023f07c23c41793c9030a9bd203a9c8cf0a7"+ integrity sha512-O3s9qhPMd6n42x9sKeJ3lhu5V1Tlnzhu6Yk8QOvDuXf7UGuUjXf9mzfHJt1dYzID4l9Fwm8toczBzPM9t0jc8Q==+ dependencies:+ "@react-aria/ssr" "^3.9.4"+ "@react-stately/utils" "^3.10.1"+ "@react-types/shared" "^3.23.1"+ "@swc/helpers" "^0.5.0"+ clsx "^2.0.0"+"@react-spring/animated@~9.4.5":version "9.4.5"resolved "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.4.5.tgz#dd9921c716a4f4a3ed29491e0c0c9f8ca0eb1a54"@@ -2467,6 +2536,18 @@"@react-spring/shared" "~9.4.5""@react-spring/types" "~9.4.5"+"@react-stately/utils@^3.10.1":+ version "3.10.1"+ resolved "https://registry.yarnpkg.com/@react-stately/utils/-/utils-3.10.1.tgz#dc8685b4994bef0dc10c37b024074be8afbfba62"+ integrity sha512-VS/EHRyicef25zDZcM/ClpzYMC5i2YGN6uegOeQawmgfGjb02yaCX0F0zR69Pod9m2Hr3wunTbtpgVXvYbZItg==+ dependencies:+ "@swc/helpers" "^0.5.0"++"@react-types/shared@^3.23.1":+ version "3.23.1"+ resolved "https://registry.yarnpkg.com/@react-types/shared/-/shared-3.23.1.tgz#2f23c81d819d0ef376df3cd4c944be4d6bce84c3"+ integrity sha512-5d+3HbFDxGZjhbMBeFHRQhexMFt4pUce3okyRtUVKbbedQFUrtXSBg9VszgF2RTeQDKDkMCIQDtz5ccP/Lk1gw==+"@remirror/core-constants@^2.0.2":version "2.0.2"resolved "https://registry.yarnpkg.com/@remirror/core-constants/-/core-constants-2.0.2.tgz#f05eccdc69e3a65e7d524b52548f567904a11a1a"@@ -3686,6 +3767,13 @@"@swc/counter" "^0.1.3"tslib "^2.4.0"+"@swc/helpers@^0.5.0":+ version "0.5.11"+ resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.11.tgz#5bab8c660a6e23c13b2d23fcd1ee44a2db1b0cb7"+ integrity sha512-YNlnKRWF2sVojTpIyzwou9XoTNbzbzONwRhOoniEioF1AtaitTvVZblaQRrAzChWQ1bLYyYSWzM18y4WwgzJ+A==+ dependencies:+ tslib "^2.4.0"+"@swc/[email protected]":version "0.1.7"resolved "https://registry.yarnpkg.com/@swc/types/-/types-0.1.7.tgz#ea5d658cf460abff51507ca8d26e2d391bafb15e"@@ -3703,18 +3791,30 @@lodash.merge "^4.6.2"postcss-selector-parser "6.0.10"-"@tanstack/react-virtual@^3.0.0-beta.60":+"@tanstack/[email protected]":version "3.5.0"resolved "https://registry.yarnpkg.com/@tanstack/react-virtual/-/react-virtual-3.5.0.tgz#873b5b77cf78af563a4a11e6251ed51ee8868132"integrity sha512-rtvo7KwuIvqK9zb0VZ5IL7fiJAEnG+0EiFZz8FUOs+2mhGqdGmjKIaT1XU7Zq0eFqL0jonLlhbayJI/J2SA/Bw==dependencies:"@tanstack/virtual-core" "3.5.0"+"@tanstack/react-virtual@^3.0.0-beta.60":+ version "3.5.1"+ resolved "https://registry.yarnpkg.com/@tanstack/react-virtual/-/react-virtual-3.5.1.tgz#1ce466f530a10f781871360ed2bf7ff83e664f85"+ integrity sha512-jIsuhfgy8GqA67PdWqg73ZB2LFE+HD9hjWL1L6ifEIZVyZVAKpYmgUG4WsKQ005aEyImJmbuimPiEvc57IY0Aw==+ dependencies:+ "@tanstack/virtual-core" "3.5.1"+"@tanstack/[email protected]":version "3.5.0"resolved "https://registry.yarnpkg.com/@tanstack/virtual-core/-/virtual-core-3.5.0.tgz#108208d0f1d75271300bc5560cf9a85a1fa01e89"integrity sha512-KnPRCkQTyqhanNC0K63GBG3wA8I+D1fQuVnAvcBF8f13akOKeQp1gSbu6f77zCxhEk727iV5oQnbHLYzHrECLg==+"@tanstack/[email protected]":+ version "3.5.1"+ resolved "https://registry.yarnpkg.com/@tanstack/virtual-core/-/virtual-core-3.5.1.tgz#f519149bce9156d0e7954b9531df15f446f2fc12"+ integrity sha512-046+AUSiDru/V9pajE1du8WayvBKeCvJ2NmKPy/mR8/SbKKrqmSbj7LJBfXE+nSq4f5TBXvnCzu0kcYebI9WdQ==+"@testing-library/dom@^9.3.4":version "9.3.4"resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-9.3.4.tgz#50696ec28376926fec0a1bf87d9dbac5e27f60ce"@@ -4317,17 +4417,12 @@"@types/node" "*""@types/node@*", "@types/node@^20.5.2":- version "20.14.1"- resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.1.tgz#2434dbcb1f039e31f2c0e9969da93f52cf6348f3"- integrity sha512-T2MzSGEu+ysB/FkWfqmhV3PLyQlowdptmmgD20C6QxsS8Fmv5SjpZ1ayXaEC0S21/h5UJ9iA6W/5vSNU5l00OA==+ version "20.14.2"+ resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.2.tgz#a5f4d2bcb4b6a87bffcaa717718c5a0f208f4a18"+ integrity sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==dependencies:undici-types "~5.26.4"-"@types/[email protected]":- version "18.0.6"- resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.6.tgz#0ba49ac517ad69abe7a1508bc9b3a5483df9d5d7"- integrity sha512-/xUq6H2aQm261exT6iZTMifUySEt4GR5KX8eYyY+C4MSNPqSh9oNIP7tz2GLKTlFaiBbgZNxffoR3CVRG+cljw==-"@types/[email protected]":version "18.14.1"resolved "https://registry.yarnpkg.com/@types/node/-/node-18.14.1.tgz#90dad8476f1e42797c49d6f8b69aaf9f876fc69f"@@ -5005,14 +5100,14 @@ ajv@^6.12.4, ajv@^6.12.5:uri-js "^4.2.2"ajv@^8.0.0, ajv@^8.6.0, ajv@^8.9.0:- version "8.15.0"- resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.15.0.tgz#d918c661e3e820bbbc65a320e182ee56a1aa978a"- integrity sha512-15BTtQUOsSrmHCy+B4VnAiJAJxJ8IFgu6fcjFQF3jQYZ78nLSQthlFg4ehp+NLIyfvFgOlxNsjKIEhydtFPVHQ==+ version "8.16.0"+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.16.0.tgz#22e2a92b94f005f7e0f9c9d39652ef0b8f6f0cb4"+ integrity sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==dependencies:fast-deep-equal "^3.1.3"- fast-uri "^2.3.0"json-schema-traverse "^1.0.0"require-from-string "^2.0.2"+ uri-js "^4.4.1"ansi-escapes@^6.2.0:version "6.2.1"@@ -5623,9 +5718,9 @@ camelcase-css@^2.0.1:integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==caniuse-lite@^1.0.30001464, caniuse-lite@^1.0.30001579, caniuse-lite@^1.0.30001587, caniuse-lite@^1.0.30001599:- version "1.0.30001627"- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001627.tgz#8071c42d468e06ed2fb2c545efe79a663fd326ab"- integrity sha512-4zgNiB8nTyV/tHhwZrFs88ryjls/lHiqFhrxCW4qSTeuRByBVnPYpDInchOIySWknznucaf31Z4KYqjfbrecVw==+ version "1.0.30001628"+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001628.tgz#90b6cd85ddc2e9f831de0225f4ca5a130c8d8222"+ integrity sha512-S3BnR4Kh26TBxbi5t5kpbcUlLJb9lhtDXISDPwOfI+JoC+ik0QksvkZtUVyikw3hjnkgkMPSJ8oIM9yMm9vflA==capital-case@^1.0.4:version "1.0.4"@@ -6281,6 +6376,11 @@ date-fns@^2.30.0:dependencies:"@babel/runtime" "^7.21.0"+date-fns@^3.6.0:+ version "3.6.0"+ resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-3.6.0.tgz#f20ca4fe94f8b754951b24240676e8618c0206bf"+ integrity sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==+version "2.6.9"resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"@@ -6322,9 +6422,9 @@ dedent@^0.7.0:integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==deep-eql@^4.1.3:- version "4.1.3"- resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-4.1.3.tgz#7c7775513092f7df98d8df9996dd085eb668cc6d"- integrity sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==+ version "4.1.4"+ resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-4.1.4.tgz#d0d3912865911bb8fac5afb4e3acfa6a28dc72b7"+ integrity sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==dependencies:type-detect "^4.0.0"@@ -6659,9 +6759,9 @@ ejs@^3.1.10, ejs@^3.1.6:jake "^10.8.5"electron-to-chromium@^1.4.668:- version "1.4.789"- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.789.tgz#fec941cb753ee139da562a5a8ff31fc3e828b411"- integrity sha512-0VbyiaXoT++Fi2vHGo2ThOeS6X3vgRCWrjPeO2FeIAWL6ItiSJ9BqlH8LfCXe3X1IdcG+S0iLoNaxQWhfZoGzQ==+ version "1.4.790"+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.790.tgz#2a3a5509593745c5d65d8acd66b308f2a25da041"+ integrity sha512-eVGeQxpaBYbomDBa/Mehrs28MdvCXfJmEFzaMFsv8jH/MJDLIylJN81eTJ5kvx7B7p18OiPK0BkC06lydEy63A==emoji-picker-react@^4.5.16:version "4.9.4"@@ -6712,9 +6812,9 @@ endent@^2.0.1:objectorarray "^1.0.5"enhanced-resolve@^5.12.0, enhanced-resolve@^5.16.0:- version "5.16.1"- resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.16.1.tgz#e8bc63d51b826d6f1cbc0a150ecb5a8b0c62e567"- integrity sha512-4U5pNsuDl0EhuZpq46M5xPslstkviJuhrdobaRDBk2Jy2KO37FDAJl4lb2KlNabxT0m4MTK2UHNrsAcphE8nyw==+ version "5.17.0"+ resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz#d037603789dd9555b89aaec7eb78845c49089bc5"+ integrity sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA==dependencies:graceful-fs "^4.2.4"tapable "^2.2.0"@@ -7126,11 +7226,11 @@ eslint-config-prettier@^9.1.0:integrity sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==eslint-config-turbo@^1.12.4:- version "1.13.3"- resolved "https://registry.yarnpkg.com/eslint-config-turbo/-/eslint-config-turbo-1.13.3.tgz#baadfa978459acd123d5806f2f4124700e225e46"- integrity sha512-if/QtwEiWZ5b7Bg8yZBPSvS0TeCG2Zvfa/+XBYANS7uSYucjmW+BBC8enJB0PqpB/YLGGOumeo3x7h1Nuba9iw==+ version "1.13.4"+ resolved "https://registry.yarnpkg.com/eslint-config-turbo/-/eslint-config-turbo-1.13.4.tgz#9c06f10c4e5d971d317baee8695fbdda24b92804"+ integrity sha512-+we4eWdZlmlEn7LnhXHCIPX/wtujbHCS7XjQM/TN09BHNEl2fZ8id4rHfdfUKIYTSKyy8U/nNyJ0DNoZj5Q8bw==dependencies:- eslint-plugin-turbo "1.13.3"+ eslint-plugin-turbo "1.13.4"eslint-import-resolver-node@^0.3.6, eslint-import-resolver-node@^0.3.9:version "0.3.9"@@ -7243,10 +7343,10 @@ eslint-plugin-react@^7.33.2:semver "^6.3.1"string.prototype.matchall "^4.0.11"- version "1.13.3"- resolved "https://registry.yarnpkg.com/eslint-plugin-turbo/-/eslint-plugin-turbo-1.13.3.tgz#0db533867a92457cb9d2be28fe6413389da2e1ab"- integrity sha512-RjmlnqYsEqnJ+U3M3IS5jLJDjWv5NsvReCpsC61n5pJ4JMHTZ/lU0EIoL1ccuL1L5wP0APzdXdByBxERcPQ+Nw==+ version "1.13.4"+ resolved "https://registry.yarnpkg.com/eslint-plugin-turbo/-/eslint-plugin-turbo-1.13.4.tgz#d237d51a33ccdf54d3be8e300f8052342a16e85c"+ integrity sha512-82GfMzrewI/DJB92Bbch239GWbGx4j1zvjk1lqb06lxIlMPnVwUHVwPbAnLfyLG3JuhLv9whxGkO/q1CL18JTg==dependencies:dotenv "16.0.3"@@ -7508,11 +7608,6 @@ fast-levenshtein@^2.0.6:resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==-fast-uri@^2.3.0:- version "2.3.0"- resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-2.3.0.tgz#bdae493942483d299e7285dcb4627767d42e2793"- integrity sha512-eel5UKGn369gGEWOqBShmFJWfq/xSJvsgDzgLYC845GneayWvXBf0lJCBn5qTABfewy1ZDPoaR5OZCP+kssfuw==-fastq@^1.6.0:version "1.17.1"resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47"@@ -8781,9 +8876,9 @@ jackspeak@^2.3.5:"@pkgjs/parseargs" "^0.11.0"jackspeak@^3.1.2:- version "3.2.3"- resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.2.3.tgz#33e8c44f7858d199fc5684f4ab62d1fd873eb10d"- integrity sha512-htOzIMPbpLid/Gq9/zaz9SfExABxqRe1sSCdxntlO/aMD6u0issZQiY25n2GKQUtJ02j7z5sfptlAOMpWWOmvw==+ version "3.4.0"+ resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.0.tgz#a75763ff36ad778ede6a156d8ee8b124de445b4a"+ integrity sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==dependencies:"@isaacs/cliui" "^8.0.2"optionalDependencies:@@ -8818,9 +8913,9 @@ jest-worker@^27.4.5:supports-color "^8.0.0"jiti@^1.18.2, jiti@^1.21.0:- version "1.21.0"- resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.0.tgz#7c97f8fe045724e136a397f7340475244156105d"- integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==+ version "1.21.3"+ resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.3.tgz#b2adb07489d7629b344d59082bbedb8c21c5f755"+ integrity sha512-uy2bNX5zQ+tESe+TiC7ilGRz8AtRGmnJH55NC5S0nSUjvvvM2hJHmefHErugGXN4pNv4Qx7vLsnNw9qJ9mtIsw==joycon@^3.0.1:version "3.1.1"@@ -10646,9 +10741,9 @@ postgres-range@^1.1.1:integrity sha512-i/hbxIE9803Alj/6ytL7UHQxRvZkI9O4Sy+J3HGc4F4oo/2eQAjTSNJ0bfxyse3bH0nuVesCk+3IRLaMtG3H6w==posthog-js@^1.131.3:- version "1.136.5"- resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.136.5.tgz#df89ec9990fe3509799b516a97c30a948464eecf"- integrity sha512-jLmR9HX7/zR/EfJ+7Fl6ivvBKJdmaFiB8mhdEITIPWpXVgGRvp3u5JuvlNXPW9r1pfux8qoPJCtsqHP+uv73gw==+ version "1.136.8"+ resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.136.8.tgz#4baef2abd3c697cc18a9f936d0a2aa8d7553b3d6"+ integrity sha512-R3NtFXoBv5bbm0nRNbjdKfCVS9UCHJf/EbBbDVcfqj4DaS1ovVSZ7wmx4Uj6SSQFwDBSRh6xePSVq8XW3AVPOw==dependencies:fflate "^0.4.8"preact "^10.19.3"@@ -10708,6 +10803,11 @@ prettier@^2.8.8:resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==+prettier@^3.1.1, prettier@^3.2.5, prettier@latest:+ version "3.3.1"+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.1.tgz#e68935518dd90bb7ec4821ba970e68f8de16e1ac"+ integrity sha512-7CAwy5dRsxs8PHXT3twixW9/OEll8MLE0VRPCJyl7CkS6VHGPSlsVaWTiASPTyGyYRyApxlaWTzwUxVNrhcwDg==+pretty-bytes@^5.3.0, pretty-bytes@^5.4.1:version "5.6.0"resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"@@ -11974,7 +12074,7 @@ snake-case@^3.0.4:dot-case "^3.0.4"tslib "^2.0.3"-sonner@^1.4.2:+sonner@^1.4.41:version "1.4.41"resolved "https://registry.yarnpkg.com/sonner/-/sonner-1.4.41.tgz#ff085ae4f4244713daf294959beaa3e90f842d2c"integrity sha512-uG511ggnnsw6gcn/X+YKkWPo5ep9il9wYi3QJxHsYe7yTZ4+cOd1wuodOUmOpFuXL+/RE3R04LczdNCDygTDgQ==@@ -12399,9 +12499,9 @@ [email protected]:sucrase "^3.32.0"tailwindcss@^3.2.7, tailwindcss@^3.3.3, tailwindcss@^3.4.3:- version "3.4.3"- resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.3.tgz#be48f5283df77dfced705451319a5dffb8621519"- integrity sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A==+ version "3.4.4"+ resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.4.tgz#351d932273e6abfa75ce7d226b5bf3a6cb257c05"+ integrity sha512-ZoyXOdJjISB7/BcLTR6SEsLgKtDStYyYZVLsUtWChO4Ps20CBad7lfJKVDiejocV4ME1hLmyY0WJE3hSDcmQ2A==dependencies:"@alloc/quick-lru" "^5.2.0"arg "^5.0.2"@@ -12709,9 +12809,9 @@ tslib@^1.13.0, tslib@^1.8.1:integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.0, tslib@^2.6.2:- version "2.6.2"- resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"- integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==+ version "2.6.3"+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"+ integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==tslib@~2.5.0:version "2.5.3"@@ -12772,47 +12872,47 @@ tunnel-agent@^0.6.0:dependencies:safe-buffer "^5.0.1"- version "1.13.3"- resolved "https://registry.yarnpkg.com/turbo-darwin-64/-/turbo-darwin-64-1.13.3.tgz#01d750e0f9ce4fced510357f1a9f7fe6312756ba"- integrity sha512-glup8Qx1qEFB5jerAnXbS8WrL92OKyMmg5Hnd4PleLljAeYmx+cmmnsmLT7tpaVZIN58EAAwu8wHC6kIIqhbWA==+ version "1.13.4"+ resolved "https://registry.yarnpkg.com/turbo-darwin-64/-/turbo-darwin-64-1.13.4.tgz#1dcea4ea0351fa38246ec26a101c862e02c27c17"+ integrity sha512-A0eKd73R7CGnRinTiS7txkMElg+R5rKFp9HV7baDiEL4xTG1FIg/56Vm7A5RVgg8UNgG2qNnrfatJtb+dRmNdw==- version "1.13.3"- resolved "https://registry.yarnpkg.com/turbo-darwin-arm64/-/turbo-darwin-arm64-1.13.3.tgz#a99950c8aff83d14070eeca987b0ee53dc881b2d"- integrity sha512-/np2xD+f/+9qY8BVtuOQXRq5f9LehCFxamiQnwdqWm5iZmdjygC5T3uVSYuagVFsZKMvX3ycySwh8dylGTl6lg==+ version "1.13.4"+ resolved "https://registry.yarnpkg.com/turbo-darwin-arm64/-/turbo-darwin-arm64-1.13.4.tgz#ed95dc05cb04f58fec8053034647140eed58bff5"+ integrity sha512-eG769Q0NF6/Vyjsr3mKCnkG/eW6dKMBZk6dxWOdrHfrg6QgfkBUk0WUUujzdtVPiUIvsh4l46vQrNVd9EOtbyA==- version "1.13.3"- resolved "https://registry.yarnpkg.com/turbo-linux-64/-/turbo-linux-64-1.13.3.tgz#a8ea12c3d79f5bbc78b2ef37f47019edb8928219"- integrity sha512-G+HGrau54iAnbXLfl+N/PynqpDwi/uDzb6iM9hXEDG+yJnSJxaHMShhOkXYJPk9offm9prH33Khx2scXrYVW1g==+ version "1.13.4"+ resolved "https://registry.yarnpkg.com/turbo-linux-64/-/turbo-linux-64-1.13.4.tgz#6856fc0543894aac547021b5a2bad8f7c936d7e7"+ integrity sha512-Bq0JphDeNw3XEi+Xb/e4xoKhs1DHN7OoLVUbTIQz+gazYjigVZvtwCvgrZI7eW9Xo1eOXM2zw2u1DGLLUfmGkQ==- version "1.13.3"- resolved "https://registry.yarnpkg.com/turbo-linux-arm64/-/turbo-linux-arm64-1.13.3.tgz#e8691ebfab0e31e276020deee83b3866b4eb966f"- integrity sha512-qWwEl5VR02NqRyl68/3pwp3c/olZuSp+vwlwrunuoNTm6JXGLG5pTeme4zoHNnk0qn4cCX7DFrOboArlYxv0wQ==+ version "1.13.4"+ resolved "https://registry.yarnpkg.com/turbo-linux-arm64/-/turbo-linux-arm64-1.13.4.tgz#2370b20311d2c86df64a3811a9309ab33c722a8d"+ integrity sha512-BJcXw1DDiHO/okYbaNdcWN6szjXyHWx9d460v6fCHY65G8CyqGU3y2uUTPK89o8lq/b2C8NK0yZD+Vp0f9VoIg==- version "1.13.3"- resolved "https://registry.yarnpkg.com/turbo-windows-64/-/turbo-windows-64-1.13.3.tgz#6629174c8f654e75c342a0e1b826620cb6e2795b"- integrity sha512-Nudr4bRChfJzBPzEmpVV85VwUYRCGKecwkBFpbp2a4NtrJ3+UP1VZES653ckqCu2FRyRuS0n03v9euMbAvzH+Q==+ version "1.13.4"+ resolved "https://registry.yarnpkg.com/turbo-windows-64/-/turbo-windows-64-1.13.4.tgz#e9f54d3837e9bd23d4b805c583f2473bcba5be68"+ integrity sha512-OFFhXHOFLN7A78vD/dlVuuSSVEB3s9ZBj18Tm1hk3aW1HTWTuAw0ReN6ZNlVObZUHvGy8d57OAGGxf2bT3etQw==- version "1.13.3"- resolved "https://registry.yarnpkg.com/turbo-windows-arm64/-/turbo-windows-arm64-1.13.3.tgz#327b8c87d8a01533deb3b7c3a108855aa7b6611d"- integrity sha512-ouJCgsVLd3icjRLmRvHQDDZnmGzT64GBupM1Y+TjtYn2LVaEBoV6hicFy8x5DUpnqdLy+YpCzRMkWlwhmkX7sQ==+ version "1.13.4"+ resolved "https://registry.yarnpkg.com/turbo-windows-arm64/-/turbo-windows-arm64-1.13.4.tgz#0adfddb0d6c167a46ecff646666e347a7d372d76"+ integrity sha512-u5A+VOKHswJJmJ8o8rcilBfU5U3Y1TTAfP9wX8bFh8teYF1ghP0EhtMRLjhtp6RPa+XCxHHVA2CiC3gbh5eg5g==turbo@^1.13.2:- version "1.13.3"- resolved "https://registry.yarnpkg.com/turbo/-/turbo-1.13.3.tgz#afb7bee4fa9f5b6041dac5b4a7d35fb98f279827"- integrity sha512-n17HJv4F4CpsYTvKzUJhLbyewbXjq1oLCi90i5tW1TiWDz16ML1eDG7wi5dHaKxzh5efIM56SITnuVbMq5dk4g==+ version "1.13.4"+ resolved "https://registry.yarnpkg.com/turbo/-/turbo-1.13.4.tgz#06767fff53f0aae43f78e12e5ac7d5e7652d40d0"+ integrity sha512-1q7+9UJABuBAHrcC4Sxp5lOqYS5mvxRrwa33wpIyM18hlOCpRD/fTJNxZ0vhbMcJmz15o9kkVm743mPn7p6jpQ==optionalDependencies:- turbo-darwin-64 "1.13.3"- turbo-darwin-arm64 "1.13.3"- turbo-linux-64 "1.13.3"- turbo-linux-arm64 "1.13.3"- turbo-windows-64 "1.13.3"- turbo-windows-arm64 "1.13.3"+ turbo-darwin-64 "1.13.4"+ turbo-darwin-arm64 "1.13.4"+ turbo-linux-64 "1.13.4"+ turbo-linux-arm64 "1.13.4"+ turbo-windows-64 "1.13.4"+ turbo-windows-arm64 "1.13.4"tween-functions@^1.2.0:version "1.2.0"@@ -13152,7 +13252,7 @@ upper-case@^2.0.2:dependencies:tslib "^2.0.3"-uri-js@^4.2.2:+uri-js@^4.2.2, uri-js@^4.4.1:version "4.4.1"resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==@@ -13340,9 +13440,9 @@ webpack-virtual-modules@^0.5.0:integrity sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==webpack-virtual-modules@^0.6.1:- version "0.6.1"- resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.6.1.tgz#ac6fdb9c5adb8caecd82ec241c9631b7a3681b6f"- integrity sha512-poXpCylU7ExuvZK8z+On3kX+S8o/2dQ/SVYueKA0D4WEMXROXgY8Ez50/bQEUmvoSMMrWcrJqCHuhAbsiwg7Dg==+ version "0.6.2"+ resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.6.2.tgz#057faa9065c8acf48f24cb57ac0e77739ab9a7e8"+ integrity sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==webpack@5:version "5.91.0"