Merge pull request #585 from makeplane/sync/ce-ee

sync: community changes

apiserver/plane/app/views/user/base.py

@@ -37,6 +37,9 @@ from plane.utils.paginator import BasePaginator
 from plane.authentication.utils.host import user_ip
 from plane.bgtasks.user_deactivation_email_task import user_deactivation_email
 from plane.utils.host import base_host
+from django.utils.decorators import method_decorator
+from django.views.decorators.cache import cache_control
+from django.views.decorators.vary import vary_on_cookie
 from plane.payment.bgtasks.member_sync_task import member_sync_task
 
 
@@ -49,6 +52,8 @@ class UserEndpoint(BaseViewSet):
         return self.request.user
 
     @cache_response(60 * 60)
+    @method_decorator(cache_control(private=True, max_age=12))
+    @method_decorator(vary_on_cookie)
     def retrieve(self, request):
         serialized_data = UserMeSerializer(request.user).data
         return Response(
@@ -57,6 +62,8 @@ class UserEndpoint(BaseViewSet):
         )
 
     @cache_response(60 * 60)
+    @method_decorator(cache_control(private=True, max_age=12))
+    @method_decorator(vary_on_cookie)
     def retrieve_user_settings(self, request):
         serialized_data = UserMeSettingsSerializer(request.user).data
         return Response(serialized_data, status=status.HTTP_200_OK)
@@ -81,6 +88,9 @@ class UserEndpoint(BaseViewSet):
         return super().partial_update(request, *args, **kwargs)
 
     @invalidate_cache(path="/api/users/me/")
+    @invalidate_cache(
+        path="/api/users/me/workspaces/", multiple=True, user=False
+    )
     def deactivate(self, request):
         # Check all workspace user is active
         user = self.get_object()
@@ -296,6 +306,8 @@ class AccountEndpoint(BaseAPIView):
 
 
 class ProfileEndpoint(BaseAPIView):
+    @method_decorator(cache_control(private=True, max_age=12))
+    @method_decorator(vary_on_cookie)
     def get(self, request):
         profile = Profile.objects.get(user=request.user)
         serializer = ProfileSerializer(profile)

apiserver/plane/app/views/workspace/base.py

@@ -44,6 +44,9 @@ from plane.db.models import (
     WorkspaceTheme,
 )
 from plane.utils.cache import cache_response, invalidate_cache
+from django.utils.decorators import method_decorator
+from django.views.decorators.cache import cache_control
+from django.views.decorators.vary import vary_on_cookie
 from plane.utils.constants import RESTRICTED_WORKSPACE_SLUGS
 from plane.payment.bgtasks.member_sync_task import member_sync_task
 
@@ -176,6 +179,8 @@ class UserWorkSpacesEndpoint(BaseAPIView):
     ]
 
     @cache_response(60 * 60 * 2)
+    @method_decorator(cache_control(private=True, max_age=12))
+    @method_decorator(vary_on_cookie)
     def get(self, request):
         fields = [
             field

apiserver/plane/license/api/views/instance.py

@@ -23,6 +23,8 @@ from plane.license.utils.instance_value import (
     get_configuration_value,
 )
 from plane.utils.cache import cache_response, invalidate_cache
+from django.utils.decorators import method_decorator
+from django.views.decorators.cache import cache_control
 
 
 class InstanceEndpoint(BaseAPIView):
@@ -36,6 +38,7 @@ class InstanceEndpoint(BaseAPIView):
         ]
 
     @cache_response(60 * 60 * 2, user=False)
+    @method_decorator(cache_control(private=True, max_age=12))
     def get(self, request):
         instance = Instance.objects.first()
 

web/app/layout.tsx

@@ -5,6 +5,8 @@ import "@/styles/globals.css";
 import "@/styles/command-pallette.css";
 import "@/styles/emoji.css";
 import "@/styles/react-day-picker.css";
+// helpers
+import { API_BASE_URL } from "@/helpers/common.helper";
 // local
 import { AppProvider } from "./provider";
 
@@ -36,6 +38,17 @@ export default function RootLayout({ children }: { children: React.ReactNode })
         <link rel="icon" type="image/png" sizes="16x16" href="/favicon/favicon-16x16.png" />
         <link rel="manifest" href="/site.webmanifest.json" />
         <link rel="shortcut icon" href="/favicon/favicon.ico" />
+        {/* preloading */}
+        <link rel="preload" href={`${API_BASE_URL}/api/instances/`} as="fetch" crossOrigin="use-credentials" />
+        <link rel="preload" href={`${API_BASE_URL}/api/users/me/ `} as="fetch" crossOrigin="use-credentials" />
+        <link rel="preload" href={`${API_BASE_URL}/api/users/me/profile/ `} as="fetch" crossOrigin="use-credentials" />
+        <link rel="preload" href={`${API_BASE_URL}/api/users/me/settings/ `} as="fetch" crossOrigin="use-credentials" />
+        <link
+          rel="preload"
+          href={`${API_BASE_URL}/api/users/me/workspaces/`}
+          as="fetch"
+          crossOrigin="use-credentials"
+        />
       </head>
       <body>
         <div id="context-menu-portal" />

web/core/components/issues/issue-detail-widgets/links/helper.tsx

@@ -21,9 +21,9 @@ export const useLinkOperations = (workspaceSlug: string, projectId: string, issu
             type: TOAST_TYPE.SUCCESS,
             title: "Link created",
           });
-        } catch (error) {
+        } catch (error: any) {
           setToast({
-            message: "The link could not be created",
+            message: error?.data?.error ?? "The link could not be created",
             type: TOAST_TYPE.ERROR,
             title: "Link not created",
           });

web/core/components/issues/issue-detail/links/root.tsx

@@ -52,9 +52,9 @@ export const IssueLinkRoot: FC<TIssueLinkRoot> = (props) => {
             title: "Link created",
           });
           toggleIssueLinkModal(false);
-        } catch (error) {
+        } catch (error: any) {
           setToast({
-            message: "The link could not be created",
+            message: error?.data?.error ?? "The link could not be created",
             type: TOAST_TYPE.ERROR,
             title: "Link not created",
           });