diff --git a/web/components/issues/issue-detail/inbox/root.tsx b/web/components/issues/issue-detail/inbox/root.tsx index 3f0f1f128..15f1625df 100644 --- a/web/components/issues/issue-detail/inbox/root.tsx +++ b/web/components/issues/issue-detail/inbox/root.tsx @@ -67,7 +67,7 @@ export const InboxIssueDetailRoot: FC = (props) => { payload: { ...response, state: "SUCCESS", element: "Inbox" }, updates: { changed_property: Object.keys(data).join(","), - change_details: Object.values(data).join(","), + change_details: !data.name && !data.description_html ? Object.values(data).join(",") : undefined, }, path: router.asPath, }); @@ -82,7 +82,7 @@ export const InboxIssueDetailRoot: FC = (props) => { payload: { state: "SUCCESS", element: "Inbox" }, updates: { changed_property: Object.keys(data).join(","), - change_details: Object.values(data).join(","), + change_details: !data.name && !data.description_html ? Object.values(data).join(",") : undefined, }, path: router.asPath, }); diff --git a/web/components/issues/issue-detail/root.tsx b/web/components/issues/issue-detail/root.tsx index 1fab25d96..dbfebff95 100644 --- a/web/components/issues/issue-detail/root.tsx +++ b/web/components/issues/issue-detail/root.tsx @@ -109,7 +109,7 @@ export const IssueDetailRoot: FC = observer((props) => { payload: { ...response, state: "SUCCESS", element: "Issue detail page" }, updates: { changed_property: Object.keys(data).join(","), - change_details: Object.values(data).join(","), + change_details: !data.name && !data.description_html ? Object.values(data).join(",") : undefined, }, path: router.asPath, }); @@ -119,7 +119,7 @@ export const IssueDetailRoot: FC = observer((props) => { payload: { state: "FAILED", element: "Issue detail page" }, updates: { changed_property: Object.keys(data).join(","), - change_details: Object.values(data).join(","), + change_details: !data.name && !data.description_html ? Object.values(data).join(",") : undefined, }, path: router.asPath, }); diff --git a/web/components/issues/peek-overview/root.tsx b/web/components/issues/peek-overview/root.tsx index c49c0a503..0650b77f3 100644 --- a/web/components/issues/peek-overview/root.tsx +++ b/web/components/issues/peek-overview/root.tsx @@ -99,7 +99,7 @@ export const IssuePeekOverview: FC = observer((props) => { payload: { ...response, state: "SUCCESS", element: "Issue peek-overview" }, updates: { changed_property: Object.keys(data).join(","), - change_details: Object.values(data).join(","), + change_details: !data.name && !data.description_html ? Object.values(data).join(",") : undefined, }, path: router.asPath, }); diff --git a/web/components/issues/sub-issues/root.tsx b/web/components/issues/sub-issues/root.tsx index 2b93384e2..79eca4d0e 100644 --- a/web/components/issues/sub-issues/root.tsx +++ b/web/components/issues/sub-issues/root.tsx @@ -160,7 +160,8 @@ export const SubIssuesRoot: FC = observer((props) => { payload: { ...oldIssue, ...issueData, state: "SUCCESS", element: "Issue detail page" }, updates: { changed_property: Object.keys(issueData).join(","), - change_details: Object.values(issueData).join(","), + change_details: + !issueData.name && !issueData.description_html ? Object.values(issueData).join(",") : undefined, }, path: router.asPath, }); @@ -176,7 +177,8 @@ export const SubIssuesRoot: FC = observer((props) => { payload: { ...oldIssue, ...issueData, state: "FAILED", element: "Issue detail page" }, updates: { changed_property: Object.keys(issueData).join(","), - change_details: Object.values(issueData).join(","), + change_details: + !issueData.name && !issueData.description_html ? Object.values(issueData).join(",") : undefined, }, path: router.asPath, }); diff --git a/web/lib/app-provider.tsx b/web/lib/app-provider.tsx index 64d323cf0..18cca8899 100644 --- a/web/lib/app-provider.tsx +++ b/web/lib/app-provider.tsx @@ -35,9 +35,9 @@ export const AppProvider: FC = observer((props) => { // store hooks const { currentUser, - membership: { currentProjectRole, currentWorkspaceRole }, + membership: { currentWorkspaceRole }, } = useUser(); - const { currentWorkspace } = useWorkspace(); + const { currentWorkspace, workspaces } = useWorkspace(); const { config: { envConfig }, } = useApplication(); @@ -52,7 +52,7 @@ export const AppProvider: FC = observer((props) => { user={currentUser} currentWorkspaceId= {currentWorkspace?.id} workspaceRole={currentWorkspaceRole} - projectRole={currentProjectRole} + workspaces={workspaces} posthogAPIKey={envConfig?.posthog_api_key || null} posthogHost={envConfig?.posthog_host || null} > diff --git a/web/store/event-tracker.store.ts b/web/store/event-tracker.store.ts index 744ad44fb..144c46d79 100644 --- a/web/store/event-tracker.store.ts +++ b/web/store/event-tracker.store.ts @@ -2,6 +2,9 @@ import { action, computed, makeObservable, observable } from "mobx"; import posthog from "posthog-js"; // stores import { RootStore } from "./root.store"; +// helpers +import { getUserRole } from "helpers/user.helper"; +// constants import { GROUP_WORKSPACE, WORKSPACE_CREATED, @@ -64,6 +67,7 @@ export class EventTrackerStore implements IEventTrackerStore { return { workspace_id: currentWorkspaceDetails?.id, project_id: currentProjectDetails?.id, + user_project_role: getUserRole(currentProjectDetails?.member_role as number), }; }