Merge branch 'develop' of github.com:makeplane/plane into chore/page_structuring

apiserver/plane/api/views/page.py

@@ -277,6 +277,45 @@ class PageViewSet(BaseViewSet):
             PageSerializer(pages, many=True).data, status=status.HTTP_200_OK
         )
 
+        unarchive_archive_page_and_descendants(page_id, datetime.now())
+
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
+    def unarchive(self, request, slug, project_id, page_id):
+        page = Page.objects.get(
+            project_id=project_id,
+            owned_by_id=request.user.id,
+            workspace__slug=slug,
+            pk=page_id,
+        )
+
+        page.parent = None
+        page.save()
+
+        unarchive_archive_page_and_descendants(page_id, None)
+
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
+    def archive_list(self, request, slug, project_id):
+        pages = (
+            Page.objects.filter(
+                project_id=project_id,
+                workspace__slug=slug,
+            )
+            .filter(archived_at__isnull=False)
+            .filter(parent_id__isnull=True)
+        )
+
+        if not pages:
+            return Response(
+                {"error": "No pages found"}, status=status.HTTP_400_BAD_REQUEST
+            )
+
+        return Response(
+            PageSerializer(pages, many=True).data, status=status.HTTP_200_OK
+        )
+
+
 
 class PageFavoriteViewSet(BaseViewSet):
     permission_classes = [
@@ -313,7 +352,6 @@ class PageFavoriteViewSet(BaseViewSet):
         page_favorite.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
-
 class PageLogEndpoint(BaseAPIView):
     permission_classes = [
         ProjectEntityPermission,

deploy/selfhost/docker-compose.yml

@@ -2,7 +2,8 @@ version: "3.8"
 
 x-app-env : &app-env
   environment:
-    - NGINX_PORT=${NGINX_PORT:-84}
+    - NGINX_PORT=${NGINX_PORT:-80}
+    - WEB_URL=${WEB_URL:-http://localhost}
     - DEBUG=${DEBUG:-0}
     - DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-plane.settings.selfhosted}
     - NEXT_PUBLIC_ENABLE_OAUTH=${NEXT_PUBLIC_ENABLE_OAUTH:-0}

deploy/selfhost/variables.env

@@ -5,6 +5,7 @@ SPACE_REPLICAS=1
 API_REPLICAS=1
 
 NGINX_PORT=80
+WEB_URL=http://localhost
 DEBUG=0
 DJANGO_SETTINGS_MODULE=plane.settings.selfhosted
 NEXT_PUBLIC_ENABLE_OAUTH=0

web/components/workspace/sidebar-dropdown.tsx

@@ -90,36 +90,40 @@ export const WorkspaceSidebarDropdown = observer(() => {
   };
 
   return (
-    <div className="flex items-center gap-x-8 gap-y-2 px-4 pt-4">
+    <div className="flex items-center gap-x-3 gap-y-2 px-4 pt-4">
       <Menu as="div" className="relative col-span-4 text-left flex-grow h-full truncate">
         {({ open }) => (
           <>
             <Menu.Button className="text-custom-sidebar-text-200 rounded-md hover:bg-custom-sidebar-background-80 text-sm font-medium focus:outline-none w-full h-full truncate">
               <div
-                className={`flex items-center gap-x-2 rounded p-1 truncate ${sidebarCollapsed ? "justify-center" : ""}`}
+                className={`flex items-center justify-between gap-x-2 rounded p-1 truncate ${
+                  sidebarCollapsed ? "justify-center" : ""
+                }`}
               >
-                <div
-                  className={`relative grid h-6 w-6 place-items-center uppercase flex-shrink-0 ${
-                    !activeWorkspace?.logo && "rounded bg-custom-primary-500 text-white"
-                  }`}
-                >
-                  {activeWorkspace?.logo && activeWorkspace.logo !== "" ? (
-                    <img
-                      src={activeWorkspace.logo}
-                      className="absolute top-0 left-0 h-full w-full object-cover rounded"
-                      alt="Workspace Logo"
-                    />
-                  ) : (
-                    activeWorkspace?.name?.charAt(0) ?? "..."
+                <div className="flex items-center gap-2">
+                  <div
+                    className={`relative grid h-6 w-6 place-items-center uppercase flex-shrink-0 ${
+                      !activeWorkspace?.logo && "rounded bg-custom-primary-500 text-white"
+                    }`}
+                  >
+                    {activeWorkspace?.logo && activeWorkspace.logo !== "" ? (
+                      <img
+                        src={activeWorkspace.logo}
+                        className="absolute top-0 left-0 h-full w-full object-cover rounded"
+                        alt="Workspace Logo"
+                      />
+                    ) : (
+                      activeWorkspace?.name?.charAt(0) ?? "..."
+                    )}
+                  </div>
+
+                  {!sidebarCollapsed && (
+                    <h4 className="text-custom-text-100 font-medium text-base truncate">
+                      {activeWorkspace?.name ? activeWorkspace.name : "Loading..."}
+                    </h4>
                   )}
                 </div>
 
-                {!sidebarCollapsed && (
-                  <h4 className="text-custom-text-100 font-medium text-base truncate">
-                    {activeWorkspace?.name ? activeWorkspace.name : "Loading..."}
-                  </h4>
-                )}
-
                 {!sidebarCollapsed && (
                   <ChevronDown
                     className={`h-4 w-4 mx-1 flex-shrink-0 ${