chore: update instance admin

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

@@ -262,7 +262,7 @@ class PageViewSet(BaseViewSet):
                 status=status.HTTP_200_OK,
             )
 
-    @allow_permission([ROLE.ADMIN], model=Page, creator=True)
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def lock(self, request, slug, project_id, pk):
         page = Page.objects.filter(
             pk=pk, workspace__slug=slug, projects__id=project_id
@@ -272,7 +272,7 @@ class PageViewSet(BaseViewSet):
         page.save()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
-    @allow_permission([ROLE.ADMIN], model=Page, creator=True)
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def unlock(self, request, slug, project_id, pk):
         page = Page.objects.filter(
             pk=pk, workspace__slug=slug, projects__id=project_id
@@ -283,7 +283,7 @@ class PageViewSet(BaseViewSet):
 
         return Response(status=status.HTTP_204_NO_CONTENT)
 
-    @allow_permission([ROLE.ADMIN], model=Page, creator=True)
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def access(self, request, slug, project_id, pk):
         access = request.data.get("access", 0)
         page = Page.objects.filter(
@@ -330,7 +330,7 @@ class PageViewSet(BaseViewSet):
         pages = PageSerializer(queryset, many=True).data
         return Response(pages, status=status.HTTP_200_OK)
 
-    @allow_permission([ROLE.ADMIN], model=Page, creator=True)
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def archive(self, request, slug, project_id, pk):
         page = Page.objects.get(
             pk=pk, workspace__slug=slug, projects__id=project_id
@@ -365,7 +365,7 @@ class PageViewSet(BaseViewSet):
             status=status.HTTP_200_OK,
         )
 
-    @allow_permission([ROLE.ADMIN], model=Page, creator=True)
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def unarchive(self, request, slug, project_id, pk):
         page = Page.objects.get(
             pk=pk, workspace__slug=slug, projects__id=project_id
@@ -438,6 +438,7 @@ class PageViewSet(BaseViewSet):
 
 
 class PageFavoriteViewSet(BaseViewSet):
+
     model = UserFavorite
 
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
@@ -464,6 +465,7 @@ class PageFavoriteViewSet(BaseViewSet):
 
 
 class PageLogEndpoint(BaseAPIView):
+
     serializer_class = PageLogSerializer
     model = PageLog
 
@@ -502,6 +504,7 @@ class PageLogEndpoint(BaseAPIView):
 
 
 class SubPagesEndpoint(BaseAPIView):
+
     @method_decorator(gzip_page)
     def get(self, request, slug, project_id, page_id):
         pages = (
@@ -519,6 +522,7 @@ class SubPagesEndpoint(BaseAPIView):
 
 
 class PagesDescriptionViewSet(BaseViewSet):
+
     @allow_permission(
         [
             ROLE.ADMIN,

apiserver/plane/bgtasks/delete_pages_from_trash.py

@@ -1,23 +0,0 @@
-# Third party imports
-from celery import shared_task
-
-# Django imports
-from django.utils import timezone
-
-# Module imports
-from plane.db.models import Page
-from plane.utils.exception_logger import log_exception
-
-
-@shared_task
-def delete_pages_from_trash():
-    try:
-        # Get all the pages whose archived_at is not null, i.e., they are in the trash
-        Page.objects.filter(
-            archived_at__isnull=False,
-            archived_at__lte=timezone.now() - timezone.timedelta(days=90),
-        ).delete()
-        return
-    except Exception as e:
-        log_exception(e)
-        return

apiserver/plane/celery.py

@@ -40,10 +40,6 @@ app.conf.beat_schedule = {
         "task": "plane.bgtasks.api_logs_task.delete_api_logs",
         "schedule": crontab(hour=0, minute=0),
     },
-    "check-every-day-to-delete-pages-from-trash": {
-        "task": "plane.bgtasks.delete_pages_from_trash.delete_pages_from_trash",
-        "schedule": crontab(hour=0, minute=0),
-    },
     "run-every-6-hours-for-instance-trace": {
         "task": "plane.license.bgtasks.tracer.instance_traces",
         "schedule": crontab(hour="*/6", minute=0),

apiserver/plane/db/migrations/0085_intake_intakeissue_remove_inboxissue_created_by_and_more.py

@@ -1,7 +1,9 @@
 # Generated by Django 4.2.15 on 2024-11-06 08:41
 
+from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
+import uuid
 
 
 class Migration(migrations.Migration):

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

@@ -11,7 +11,9 @@ class InstanceSerializer(BaseSerializer):
 
     class Meta:
         model = Instance
-        fields = "__all__"
+        exclude = [
+            "license_key",
+        ]
         read_only_fields = [
             "id",
             "email",

apiserver/plane/license/bgtasks/tracer.py

@@ -3,7 +3,7 @@ from celery import shared_task
 from opentelemetry import trace
 
 # Module imports
-from plane.license.models import Instance
+from plane.license.models import Instance, InstanceAdmin
 from plane.db.models import (
     User,
     Workspace,
@@ -25,6 +25,7 @@ def instance_traces():
 
     # Check if the instance is registered
     instance = Instance.objects.first()
+    instance_admin = InstanceAdmin.objects.first()
 
     # If instance is None then return
     if instance is None:
@@ -73,6 +74,13 @@ def instance_traces():
             span.set_attribute("module_issue_count", module_issue_count)
             span.set_attribute("page_count", page_count)
 
+            if instance_admin:
+                span.set_attribute("admin_email", instance_admin.user.email)
+                span.set_attribute(
+                    "admin_name",
+                    f"{instance_admin.user.first_name} {instance_admin.user.last_name}",
+                )
+
         # Workspace details
         for workspace in Workspace.objects.all():
             # Count of all models

apiserver/plane/license/management/commands/register_instance.py

@@ -9,7 +9,7 @@ from django.utils import timezone
 from django.conf import settings
 
 # Module imports
-from plane.license.models import Instance, InstanceEdition
+from plane.license.models import Instance, EditiontTypes
 from plane.license.bgtasks.tracer import instance_traces
 
 
@@ -55,7 +55,7 @@ class Command(BaseCommand):
                 latest_version=payload.get("version"),
                 last_checked_at=timezone.now(),
                 is_test=os.environ.get("IS_TEST", "0") == "1",
-                edition=InstanceEdition.PLANE_COMMUNITY.value,
+                edition=EditiontTypes.PLANE_CE.value,
             )
 
             self.stdout.write(self.style.SUCCESS("Instance registered"))
@@ -69,7 +69,7 @@ class Command(BaseCommand):
             instance.current_version = payload.get("version")
             instance.latest_version = payload.get("version")
             instance.is_test = os.environ.get("IS_TEST", "0") == "1"
-            instance.edition = InstanceEdition.PLANE_COMMUNITY.value
+            instance.edition = EditiontTypes.PLANE_CE.value
             instance.save()
 
         # Call the instance traces task

apiserver/plane/license/migrations/0005_rename_product_instance_edition_and_more.py

@@ -4,32 +4,28 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
-        ("license", "0004_changelog_deleted_at_instance_deleted_at_and_more"),
+        ('license', '0004_changelog_deleted_at_instance_deleted_at_and_more'),
     ]
 
     operations = [
         migrations.RenameField(
-            model_name="instance",
-            old_name="product",
-            new_name="edition",
+            model_name='instance',
+            old_name='product',
+            new_name='edition',
         ),
         migrations.RemoveField(
-            model_name="instance",
-            name="license_key",
+            model_name='instance',
+            name='license_key',
         ),
         migrations.RemoveField(
-            model_name="instance",
-            name="user_count",
+            model_name='instance',
+            name='user_count',
         ),
         migrations.AddField(
-            model_name="instance",
-            name="is_test",
+            model_name='instance',
+            name='is_test',
             field=models.BooleanField(default=False),
         ),
-        migrations.AlterField(
-            model_name="instance",
-            name="edition",
-            field=models.CharField(default="PLANE_COMMUNITY", max_length=255),
-        ),
     ]

apiserver/plane/license/models/__init__.py

@@ -2,5 +2,5 @@ from .instance import (
     Instance,
     InstanceAdmin,
     InstanceConfiguration,
-    InstanceEdition,
+    EditiontTypes,
 )

apiserver/plane/license/models/instance.py

@@ -11,8 +11,8 @@ from plane.db.models import BaseModel
 ROLE_CHOICES = ((20, "Admin"),)
 
 
-class InstanceEdition(Enum):
-    PLANE_COMMUNITY = "PLANE_COMMUNITY"
+class EditiontTypes(Enum):
+    PLANE_CE = "plane-ce"
 
 
 class Instance(BaseModel):
@@ -23,7 +23,7 @@ class Instance(BaseModel):
     current_version = models.CharField(max_length=255)
     latest_version = models.CharField(max_length=255, null=True, blank=True)
     edition = models.CharField(
-        max_length=255, default=InstanceEdition.PLANE_COMMUNITY.value
+        max_length=255, default=EditiontTypes.PLANE_CE.value
     )
     domain = models.TextField(blank=True)
     # Instance specifics

apiserver/plane/settings/common.py

@@ -303,7 +303,6 @@ CELERY_IMPORTS = (
     "plane.bgtasks.email_notification_task",
     "plane.bgtasks.api_logs_task",
     "plane.license.bgtasks.tracer",
-    "plane.bgtasks.delete_pages_from_trash",
     # management tasks
     "plane.bgtasks.dummy_data_task",
 )

apiserver/plane/space/urls/intake.py

@@ -3,6 +3,7 @@ from django.urls import path
 
 from plane.space.views import (
     IntakeIssuePublicViewSet,
+    IssueVotePublicViewSet,
     WorkspaceProjectDeployBoardEndpoint,
 )
 

packages/types/src/pages.d.ts

@@ -23,7 +23,7 @@ export type TPage = {
 };
 
 // page filters
-export type TPageNavigationTabs = "public" | "private" | "trash";
+export type TPageNavigationTabs = "public" | "private" | "archived";
 
 export type TPageFiltersSortKey =
   | "name"

web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(detail)/[pageId]/page.tsx

@@ -20,7 +20,7 @@ const PageDetailsPage = observer(() => {
   const { workspaceSlug, projectId, pageId } = useParams();
 
   // store hooks
-  const { fetchPageById } = useProjectPages();
+  const { getPageById } = useProjectPages();
   const page = usePage(pageId?.toString() ?? "");
   const { id, name } = page;
 
@@ -28,7 +28,7 @@ const PageDetailsPage = observer(() => {
   const { error: pageDetailsError } = useSWR(
     workspaceSlug && projectId && pageId ? `PAGE_DETAILS_${pageId}` : null,
     workspaceSlug && projectId && pageId
-      ? () => fetchPageById(workspaceSlug?.toString(), projectId?.toString(), pageId.toString())
+      ? () => getPageById(workspaceSlug?.toString(), projectId?.toString(), pageId.toString())
       : null,
     {
       revalidateIfStale: false,

web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(list)/page.tsx

@@ -1,8 +1,7 @@
 "use client";
 
-import { useEffect } from "react";
 import { observer } from "mobx-react";
-import { useParams, useSearchParams, useRouter } from "next/navigation";
+import { useParams, useSearchParams } from "next/navigation";
 // types
 import { TPageNavigationTabs } from "@plane/types";
 // components
@@ -13,18 +12,14 @@ import { PagesListRoot, PagesListView } from "@/components/pages";
 import { EmptyStateType } from "@/constants/empty-state";
 // hooks
 import { useProject } from "@/hooks/store";
-import { useQueryParams } from "@/hooks/use-query-params";
 
 const ProjectPagesPage = observer(() => {
   // router
-  const router = useRouter();
-  // params
-  const { workspaceSlug, projectId } = useParams();
   const searchParams = useSearchParams();
   const type = searchParams.get("type");
+  const { workspaceSlug, projectId } = useParams();
   // store hooks
   const { getProjectById, currentProjectDetails } = useProject();
-  const { updateQueryParams } = useQueryParams();
   // derived values
   const project = projectId ? getProjectById(projectId.toString()) : undefined;
   const pageTitle = project?.name ? `${project?.name} - Pages` : undefined;
@@ -32,21 +27,9 @@ const ProjectPagesPage = observer(() => {
   const currentPageType = (): TPageNavigationTabs => {
     const pageType = type?.toString();
     if (pageType === "private") return "private";
-    if (pageType === "trash") return "trash";
+    if (pageType === "archived") return "archived";
     return "public";
   };
-  // update the route to public pages if the type is invalid
-  useEffect(() => {
-    const pageType = type?.toString();
-    if (pageType !== "public" && pageType !== "private" && pageType !== "trash") {
-      const updatedRoute = updateQueryParams({
-        paramsToAdd: {
-          type: "public",
-        },
-      });
-      router.push(updatedRoute);
-    }
-  }, [router, type, updateQueryParams]);
 
   if (!workspaceSlug || !projectId) return <></>;
 

web/core/components/pages/list/tab-navigation.tsx

@@ -22,8 +22,8 @@ const pageTabs: { key: TPageNavigationTabs; label: string }[] = [
     label: "Private",
   },
   {
-    key: "trash",
-    label: "Trash",
+    key: "archived",
+    label: "Archived",
   },
 ];
 

web/core/components/pages/loaders/page-loader.tsx

@@ -2,29 +2,33 @@
 
 import { Loader } from "@plane/ui";
 
-export const PageLoader: React.FC = () => (
-  <div className="relative w-full h-full flex flex-col">
-    <div className="px-3 border-b border-custom-border-100 py-3">
-      <Loader className="relative flex items-center gap-2">
-        <Loader.Item width="200px" height="30px" />
-        <div className="relative flex items-center gap-2 ml-auto">
-          <Loader.Item width="100px" height="30px" />
-          <Loader.Item width="100px" height="30px" />
-        </div>
-      </Loader>
-    </div>
-    <div>
-      {Array.from(Array(10)).map((_, index) => (
-        <Loader key={index} className="relative flex items-center gap-2 p-3 py-4 border-b border-custom-border-100">
-          <Loader.Item width={`${250 + 10 * Math.floor(Math.random() * 10)}px`} height="22px" />
-          <div className="ml-auto relative flex items-center gap-2">
-            <Loader.Item width="60px" height="22px" />
-            <Loader.Item width="22px" height="22px" />
-            <Loader.Item width="22px" height="22px" />
-            <Loader.Item width="22px" height="22px" />
+export const PageLoader: React.FC = (props) => {
+  const {} = props;
+
+  return (
+    <div className="relative w-full h-full flex flex-col">
+      <div className="px-3 border-b border-custom-border-100 py-3">
+        <Loader className="relative flex items-center gap-2">
+          <Loader.Item width="200px" height="30px" />
+          <div className="relative flex items-center gap-2 ml-auto">
+            <Loader.Item width="100px" height="30px" />
+            <Loader.Item width="100px" height="30px" />
           </div>
         </Loader>
-      ))}
+      </div>
+      <div>
+        {Array.from(Array(10)).map((i) => (
+          <Loader key={i} className="relative flex items-center gap-2 p-3 py-4 border-b border-custom-border-100">
+            <Loader.Item width={`${250 + 10 * Math.floor(Math.random() * 10)}px`} height="22px" />
+            <div className="ml-auto relative flex items-center gap-2">
+              <Loader.Item width="60px" height="22px" />
+              <Loader.Item width="22px" height="22px" />
+              <Loader.Item width="22px" height="22px" />
+              <Loader.Item width="22px" height="22px" />
+            </div>
+          </Loader>
+        ))}
+      </div>
     </div>
-  </div>
-);
+  );
+};

web/core/components/pages/pages-list-main-content.tsx

@@ -32,35 +32,35 @@ export const PagesListMainContent: React.FC<Props> = observer((props) => {
   if (loader === "init-loader") return <PageLoader />;
   // if no pages exist in the active page type
   if (!isAnyPageAvailable || pageIds?.length === 0) {
-    return (
-      <div className="size-full">
-        {!isAnyPageAvailable && (
-          <EmptyState
-            type={EmptyStateType.PROJECT_PAGE}
-            primaryButtonOnClick={() => {
-              toggleCreatePageModal({ isOpen: true });
-            }}
-          />
-        )}
-        {pageType === "public" ? (
-          <EmptyState
-            type={EmptyStateType.PROJECT_PAGE_PUBLIC}
-            primaryButtonOnClick={() => {
-              toggleCreatePageModal({ isOpen: true, pageAccess: EPageAccess.PUBLIC });
-            }}
-          />
-        ) : pageType === "private" ? (
-          <EmptyState
-            type={EmptyStateType.PROJECT_PAGE_PRIVATE}
-            primaryButtonOnClick={() => {
-              toggleCreatePageModal({ isOpen: true, pageAccess: EPageAccess.PRIVATE });
-            }}
-          />
-        ) : pageType === "trash" ? (
-          <EmptyState type={EmptyStateType.PROJECT_PAGE_TRASH} />
-        ) : null}
-      </div>
-    );
+    if (!isAnyPageAvailable) {
+      return (
+        <EmptyState
+          type={EmptyStateType.PROJECT_PAGE}
+          primaryButtonOnClick={() => {
+            toggleCreatePageModal({ isOpen: true });
+          }}
+        />
+      );
+    }
+    if (pageType === "public")
+      return (
+        <EmptyState
+          type={EmptyStateType.PROJECT_PAGE_PUBLIC}
+          primaryButtonOnClick={() => {
+            toggleCreatePageModal({ isOpen: true, pageAccess: EPageAccess.PUBLIC });
+          }}
+        />
+      );
+    if (pageType === "private")
+      return (
+        <EmptyState
+          type={EmptyStateType.PROJECT_PAGE_PRIVATE}
+          primaryButtonOnClick={() => {
+            toggleCreatePageModal({ isOpen: true, pageAccess: EPageAccess.PRIVATE });
+          }}
+        />
+      );
+    if (pageType === "archived") return <EmptyState type={EmptyStateType.PROJECT_PAGE_ARCHIVED} />;
   }
   // if no pages match the filter criteria
   if (filteredPageIds?.length === 0)

web/core/services/page/project-page.service.ts

@@ -95,7 +95,7 @@ export class ProjectPageService extends APIService {
       });
   }
 
-  async moveToTrash(
+  async archive(
     workspaceSlug: string,
     projectId: string,
     pageId: string
@@ -109,7 +109,7 @@ export class ProjectPageService extends APIService {
       });
   }
 
-  async restoreFromTrash(workspaceSlug: string, projectId: string, pageId: string): Promise<void> {
+  async restore(workspaceSlug: string, projectId: string, pageId: string): Promise<void> {
     return this.delete(`/api/workspaces/${workspaceSlug}/projects/${projectId}/pages/${pageId}/archive/`)
       .then((response) => response?.data)
       .catch((error) => {

web/core/store/pages/page.ts

@@ -22,7 +22,7 @@ export interface IPage extends TPage {
   canCurrentUserDuplicatePage: boolean;
   canCurrentUserLockPage: boolean;
   canCurrentUserChangeAccess: boolean;
-  canCurrentUserTrashPage: boolean;
+  canCurrentUserArchivePage: boolean;
   canCurrentUserDeletePage: boolean;
   canCurrentUserFavoritePage: boolean;
   isContentEditable: boolean;
@@ -38,8 +38,8 @@ export interface IPage extends TPage {
   makePrivate: () => Promise<void>;
   lock: () => Promise<void>;
   unlock: () => Promise<void>;
-  moveToTrash: () => Promise<void>;
-  restoreFromTrash: () => Promise<void>;
+  archive: () => Promise<void>;
+  restore: () => Promise<void>;
   updatePageLogo: (logo_props: TLogoProps) => Promise<void>;
   addToFavorites: () => Promise<void>;
   removePageFromFavorites: () => Promise<void>;
@@ -132,7 +132,7 @@ export class Page implements IPage {
       canCurrentUserDuplicatePage: computed,
       canCurrentUserLockPage: computed,
       canCurrentUserChangeAccess: computed,
-      canCurrentUserTrashPage: computed,
+      canCurrentUserArchivePage: computed,
       canCurrentUserDeletePage: computed,
       canCurrentUserFavoritePage: computed,
       isContentEditable: computed,
@@ -144,8 +144,8 @@ export class Page implements IPage {
       makePrivate: action,
       lock: action,
       unlock: action,
-      moveToTrash: action,
-      restoreFromTrash: action,
+      archive: action,
+      restore: action,
       updatePageLogo: action,
       addToFavorites: action,
       removePageFromFavorites: action,
@@ -204,11 +204,9 @@ export class Page implements IPage {
     };
   }
 
-  /**
-   * @description returns true if the current logged in user is the owner of the page
-   */
   get isCurrentUserOwner() {
     const currentUserId = this.store.user.data?.id;
+    if (!currentUserId) return false;
     return this.owned_by === currentUserId;
   }
 
@@ -217,6 +215,7 @@ export class Page implements IPage {
    */
   get canCurrentUserEditPage() {
     const { workspaceSlug, projectId } = this.store.router;
+
     const currentUserProjectRole = this.store.user.permission.projectPermissionsByWorkspaceSlugAndProjectId(
       workspaceSlug?.toString() || "",
       projectId?.toString() || ""
@@ -229,6 +228,7 @@ export class Page implements IPage {
    */
   get canCurrentUserDuplicatePage() {
     const { workspaceSlug, projectId } = this.store.router;
+
     const currentUserProjectRole = this.store.user.permission.projectPermissionsByWorkspaceSlugAndProjectId(
       workspaceSlug?.toString() || "",
       projectId?.toString() || ""
@@ -240,31 +240,22 @@ export class Page implements IPage {
    * @description returns true if the current logged in user can lock the page
    */
   get canCurrentUserLockPage() {
-    const { workspaceSlug, projectId } = this.store.router;
-    const currentUserProjectRole = this.store.user.permission.projectPermissionsByWorkspaceSlugAndProjectId(
-      workspaceSlug?.toString() || "",
-      projectId?.toString() || ""
-    );
-    return this.isCurrentUserOwner || currentUserProjectRole === EUserPermissions.ADMIN;
+    return this.isCurrentUserOwner;
   }
 
   /**
    * @description returns true if the current logged in user can change the access of the page
    */
   get canCurrentUserChangeAccess() {
-    const { workspaceSlug, projectId } = this.store.router;
-    const currentUserProjectRole = this.store.user.permission.projectPermissionsByWorkspaceSlugAndProjectId(
-      workspaceSlug?.toString() || "",
-      projectId?.toString() || ""
-    );
-    return this.isCurrentUserOwner || currentUserProjectRole === EUserPermissions.ADMIN;
+    return this.isCurrentUserOwner;
   }
 
   /**
-   * @description returns true if the current logged in user can trash the page
+   * @description returns true if the current logged in user can archive the page
    */
-  get canCurrentUserTrashPage() {
+  get canCurrentUserArchivePage() {
     const { workspaceSlug, projectId } = this.store.router;
+
     const currentUserProjectRole = this.store.user.permission.projectPermissionsByWorkspaceSlugAndProjectId(
       workspaceSlug?.toString() || "",
       projectId?.toString() || ""
@@ -277,6 +268,7 @@ export class Page implements IPage {
    */
   get canCurrentUserDeletePage() {
     const { workspaceSlug, projectId } = this.store.router;
+
     const currentUserProjectRole = this.store.user.permission.projectPermissionsByWorkspaceSlugAndProjectId(
       workspaceSlug?.toString() || "",
       projectId?.toString() || ""
@@ -289,6 +281,7 @@ export class Page implements IPage {
    */
   get canCurrentUserFavoritePage() {
     const { workspaceSlug, projectId } = this.store.router;
+
     const currentUserProjectRole = this.store.user.permission.projectPermissionsByWorkspaceSlugAndProjectId(
       workspaceSlug?.toString() || "",
       projectId?.toString() || ""
@@ -308,11 +301,11 @@ export class Page implements IPage {
       projectId?.toString() || ""
     );
     const isPublic = this.access === EPageAccess.PUBLIC;
-    const isTrashed = this.archived_at;
+    const isArchived = this.archived_at;
     const isLocked = this.is_locked;
 
     return (
-      !isTrashed &&
+      !isArchived &&
       !isLocked &&
       (isOwner || (isPublic && !!currentUserRole && currentUserRole >= EUserPermissions.MEMBER))
     );
@@ -476,12 +469,12 @@ export class Page implements IPage {
   };
 
   /**
-   * @description move the page to trash
+   * @description archive the page
    */
-  moveToTrash = async () => {
+  archive = async () => {
     const { workspaceSlug, projectId } = this.store.router;
     if (!workspaceSlug || !projectId || !this.id) return undefined;
-    const response = await this.pageService.moveToTrash(workspaceSlug, projectId, this.id);
+    const response = await this.pageService.archive(workspaceSlug, projectId, this.id);
     runInAction(() => {
       this.archived_at = response.archived_at;
     });
@@ -489,12 +482,12 @@ export class Page implements IPage {
   };
 
   /**
-   * @description restore the page from trash
+   * @description restore the page
    */
-  restoreFromTrash = async () => {
+  restore = async () => {
     const { workspaceSlug, projectId } = this.store.router;
     if (!workspaceSlug || !projectId || !this.id) return undefined;
-    await this.pageService.restoreFromTrash(workspaceSlug, projectId, this.id);
+    await this.pageService.restore(workspaceSlug, projectId, this.id);
     runInAction(() => {
       this.archived_at = null;
     });

web/core/store/pages/project-page.store.ts

@@ -31,8 +31,12 @@ export interface IProjectPageStore {
   updateFilters: <T extends keyof TPageFilters>(filterKey: T, filterValue: TPageFilters[T]) => void;
   clearAllFilters: () => void;
   // actions
-  fetchAllPages: (workspaceSlug: string, projectId: string) => Promise<TPage[]>;
-  fetchPageById: (workspaceSlug: string, projectId: string, pageId: string) => Promise<TPage>;
+  getAllPages: (
+    workspaceSlug: string,
+    projectId: string,
+    pageType: TPageNavigationTabs
+  ) => Promise<TPage[] | undefined>;
+  getPageById: (workspaceSlug: string, projectId: string, pageId: string) => Promise<TPage | undefined>;
   createPage: (pageData: Partial<TPage>) => Promise<TPage | undefined>;
   removePage: (pageId: string) => Promise<void>;
 }
@@ -62,8 +66,8 @@ export class ProjectPageStore implements IProjectPageStore {
       updateFilters: action,
       clearAllFilters: action,
       // actions
-      fetchAllPages: action,
-      fetchPageById: action,
+      getAllPages: action,
+      getPageById: action,
       createPage: action,
       removePage: action,
     });
@@ -150,14 +154,13 @@ export class ProjectPageStore implements IProjectPageStore {
   /**
    * @description fetch all the pages
    */
-  fetchAllPages = async (workspaceSlug: string, projectId: string) => {
+  getAllPages = async (workspaceSlug: string, projectId: string, pageType: TPageNavigationTabs) => {
     try {
-      if (!workspaceSlug || !projectId) {
-        throw new Error("workspace slug or project id not provided");
-      }
+      if (!workspaceSlug || !projectId) return undefined;
 
+      const currentPageIds = this.getCurrentProjectPageIds(pageType);
       runInAction(() => {
-        this.loader = this.isAnyPageAvailable ? `mutation-loader` : `init-loader`;
+        this.loader = currentPageIds && currentPageIds.length > 0 ? `mutation-loader` : `init-loader`;
         this.error = undefined;
       });
 
@@ -184,15 +187,13 @@ export class ProjectPageStore implements IProjectPageStore {
    * @description fetch the details of a page
    * @param {string} pageId
    */
-  fetchPageById = async (workspaceSlug: string, projectId: string, pageId: string) => {
+  getPageById = async (workspaceSlug: string, projectId: string, pageId: string) => {
     try {
-      if (!workspaceSlug || !projectId || !pageId) {
-        throw new Error("workspace slug, project id or page id not provided");
-      }
+      if (!workspaceSlug || !projectId || !pageId) return undefined;
 
-      const currentPage = this.pageById(pageId);
+      const currentPageId = this.pageById(pageId);
       runInAction(() => {
-        this.loader = currentPage ? `mutation-loader` : `init-loader`;
+        this.loader = currentPageId ? `mutation-loader` : `init-loader`;
         this.error = undefined;
       });
 

web/helpers/page.helper.ts

@@ -14,7 +14,7 @@ export const filterPagesByPageType = (pageType: TPageNavigationTabs, pages: TPag
   pages.filter((page) => {
     if (pageType === "public") return page.access === 0 && !page.archived_at;
     if (pageType === "private") return page.access === 1 && !page.archived_at;
-    if (pageType === "trash") return page.archived_at;
+    if (pageType === "archived") return page.archived_at;
     return true;
   });