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

makeplane · Apr 23, 2024 · 5e53279 · 5e53279
2 parents 098a195 + bf85273
commit 5e53279
Show file tree

Hide file tree

Showing 54 changed files with 1,057 additions and 855 deletions.
diff --git a/apiserver/plane/app/serializers/module.py b/apiserver/plane/app/serializers/module.py
@@ -210,6 +210,7 @@ class Meta:
             "backlog_issues",
             "created_at",
             "updated_at",
+            "archived_at",
         ]
         read_only_fields = fields
 

diff --git a/apiserver/plane/app/views/__init__.py b/apiserver/plane/app/views/__init__.py
@@ -38,7 +38,7 @@
     WorkSpaceAvailabilityCheckEndpoint,
     UserWorkspaceDashboardEndpoint,
     WorkspaceThemeViewSet,
-    ExportWorkspaceUserActivityEndpoint
+    ExportWorkspaceUserActivityEndpoint,
 )
 
 from .workspace.member import (
@@ -91,12 +91,14 @@
     CycleDateCheckEndpoint,
     CycleFavoriteViewSet,
     TransferCycleIssueEndpoint,
-    CycleArchiveUnarchiveEndpoint,
     CycleUserPropertiesEndpoint,
 )
 from .cycle.issue import (
     CycleIssueViewSet,
 )
+from .cycle.archive import (
+    CycleArchiveUnarchiveEndpoint,
+)
 
 from .asset.base import FileAssetEndpoint, UserAssetsEndpoint, FileAssetViewSet
 from .issue.base import (
@@ -170,14 +172,17 @@
     ModuleViewSet,
     ModuleLinkViewSet,
     ModuleFavoriteViewSet,
-    ModuleArchiveUnarchiveEndpoint,
     ModuleUserPropertiesEndpoint,
 )
 
 from .module.issue import (
     ModuleIssueViewSet,
 )
 
+from .module.archive import (
+    ModuleArchiveUnarchiveEndpoint,
+)
+
 from .api import ApiTokenEndpoint