π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
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.tsindex 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 commentexport * 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.tsxindex 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";// componentsimport { IssueCommentCreate } from "@/components/issues";-import { IssueActivityCommentRoot } from "@/components/issues/issue-detail";+import { ActivitySortRoot, IssueActivityCommentRoot } from "@/components/issues/issue-detail";// hooksimport { useIssueDetail, useProject, useUser, useUserPermissions } from "@/hooks/store";// plane web componentsimport { ActivityFilterRoot, IssueActivityWorklogCreateButton } from "@/plane-web/components/issues/worklog";-import { ActivitySortRoot } from "@/plane-web/components/issues/worklog/activity/sort-root";// plane web constantsimport { 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) => {// hooksconst {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} /><ActivityFilterRootselectedFilters={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.tsxsimilarity index 93%rename from web/ce/components/issues/worklog/activity/sort-root.tsxrename to web/core/components/issues/issue-detail/issue-activity/sort-root.tsxindex 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";