Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

fix: issue activity sort order componenet import (#6098)

Prateek Shourya9dbb2b26c3ba
diff --git a/web/core/components/issues/issue-detail/issue-activity/index.ts b/web/core/components/issues/issue-detail/issue-activity/index.ts
index fd2b709852..e6d5ce077c 100644
--- a/web/core/components/issues/issue-detail/issue-activity/index.ts
+++ b/web/core/components/issues/issue-detail/issue-activity/index.ts
@@ -8,3 +8,6 @@ export * from "./activity-filter";
// issue comment
export * from "./comments";
+
+// sort
+export * from "./sort-root";
diff --git a/web/core/components/issues/issue-detail/issue-activity/root.tsx b/web/core/components/issues/issue-detail/issue-activity/root.tsx
index 7df297d2cc..38f6b01c60 100644
--- a/web/core/components/issues/issue-detail/issue-activity/root.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/root.tsx
@@ -9,12 +9,11 @@ import { EFileAssetType } from "@plane/types/src/enums";
import { TOAST_TYPE, setToast } from "@plane/ui";
// components
import { IssueCommentCreate } from "@/components/issues";
-import { IssueActivityCommentRoot } from "@/components/issues/issue-detail";
+import { ActivitySortRoot, IssueActivityCommentRoot } from "@/components/issues/issue-detail";
// hooks
import { useIssueDetail, useProject, useUser, useUserPermissions } from "@/hooks/store";
// plane web components
import { ActivityFilterRoot, IssueActivityWorklogCreateButton } from "@/plane-web/components/issues/worklog";
-import { ActivitySortRoot } from "@/plane-web/components/issues/worklog/activity/sort-root";
// plane web constants
import { TActivityFilters, defaultActivityFilters } from "@/plane-web/constants/issues";
import { EUserPermissions } from "@/plane-web/constants/user-permissions";
@@ -44,7 +43,7 @@ export const IssueActivity: FC<TIssueActivity> = observer((props) => {
// hooks
const {
issue: { getIssueById },
- activity: { sortOrder, toggleSortOrder},
+ activity: { sortOrder, toggleSortOrder },
createComment,
updateComment,
removeComment,
@@ -164,7 +163,7 @@ export const IssueActivity: FC<TIssueActivity> = observer((props) => {
disabled={disabled}
/>
)}
- <ActivitySortRoot sortOrder={sortOrder} toggleSort={toggleSortOrder}/>
+ <ActivitySortRoot sortOrder={sortOrder} toggleSort={toggleSortOrder} />
<ActivityFilterRoot
selectedFilters={selectedFilters}
toggleFilter={toggleFilter}
diff --git a/web/ce/components/issues/worklog/activity/sort-root.tsx b/web/core/components/issues/issue-detail/issue-activity/sort-root.tsx
similarity index 93%
rename from web/ce/components/issues/worklog/activity/sort-root.tsx
rename to web/core/components/issues/issue-detail/issue-activity/sort-root.tsx
index 75cd1cd033..ed4d371b52 100644
--- a/web/ce/components/issues/worklog/activity/sort-root.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/sort-root.tsx
@@ -25,4 +25,4 @@ export const ActivitySortRoot: FC<TActivitySortRoot> = memo((props) => (
</div>
));
-ActivitySortRoot.displayName = "ActivitySortRoot";
\ No newline at end of file
+ActivitySortRoot.displayName = "ActivitySortRoot";