Skip to content

Commit 27bf257

Browse files
[WEB-5534] fix: intake state dropdown (#8199)
1 parent 22bb3c5 commit 27bf257

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

apps/web/core/components/inbox/content/issue-properties.tsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import { DateDropdown } from "@/components/dropdowns/date";
1717
import { IntakeStateDropdown } from "@/components/dropdowns/intake-state/dropdown";
1818
import { MemberDropdown } from "@/components/dropdowns/member/dropdown";
1919
import { PriorityDropdown } from "@/components/dropdowns/priority";
20+
import { StateDropdown } from "@/components/dropdowns/state/dropdown";
2021
import type { TIssueOperations } from "@/components/issues/issue-detail";
2122
import { IssueLabel } from "@/components/issues/issue-detail/label";
2223
// hooks
@@ -30,10 +31,12 @@ type Props = {
3031
issueOperations: TIssueOperations;
3132
isEditable: boolean;
3233
duplicateIssueDetails: TInboxDuplicateIssueDetails | undefined;
34+
isIntakeAccepted: boolean;
3335
};
3436

3537
export const InboxIssueContentProperties = observer(function InboxIssueContentProperties(props: Props) {
36-
const { workspaceSlug, projectId, issue, issueOperations, isEditable, duplicateIssueDetails } = props;
38+
const { workspaceSlug, projectId, issue, issueOperations, isEditable, duplicateIssueDetails, isIntakeAccepted } =
39+
props;
3740

3841
const router = useAppRouter();
3942
// store hooks
@@ -50,6 +53,7 @@ export const InboxIssueContentProperties = observer(function InboxIssueContentPr
5053
projectIdentifier: currentProjectDetails?.identifier,
5154
sequenceId: duplicateIssueDetails?.sequence_id,
5255
});
56+
const DropdownComponent = isIntakeAccepted ? StateDropdown : IntakeStateDropdown;
5357

5458
return (
5559
<div className="flex w-full flex-col divide-y-2 divide-custom-border-200">
@@ -64,11 +68,11 @@ export const InboxIssueContentProperties = observer(function InboxIssueContentPr
6468
<span>State</span>
6569
</div>
6670
{issue?.state_id && (
67-
<IntakeStateDropdown
71+
<DropdownComponent
6872
value={issue?.state_id}
6973
onChange={() => {}}
7074
projectId={projectId?.toString() ?? ""}
71-
disabled={!isEditable}
75+
disabled
7276
buttonVariant="transparent-with-text"
7377
className="w-3/5 flex-grow group"
7478
buttonContainerClassName="w-full text-left"

apps/web/core/components/inbox/content/issue-root.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { WORK_ITEM_TRACKER_EVENTS } from "@plane/constants";
66
import type { EditorRefApi } from "@plane/editor";
77
import { TOAST_TYPE, setToast } from "@plane/propel/toast";
88
import type { TIssue, TNameDescriptionLoader } from "@plane/types";
9-
import { EFileAssetType, EInboxIssueSource } from "@plane/types";
9+
import { EFileAssetType, EInboxIssueSource, EInboxIssueStatus } from "@plane/types";
1010
import { getTextContent } from "@plane/utils";
1111
// components
1212
import { DescriptionVersionsRoot } from "@/components/core/description-versions";
@@ -74,6 +74,7 @@ export const InboxIssueMainContent = observer(function InboxIssueMainContent(pro
7474
// derived values
7575
const issue = inboxIssue.issue;
7676
const projectDetails = issue?.project_id ? getProjectById(issue?.project_id) : undefined;
77+
const isIntakeAccepted = inboxIssue.status === EInboxIssueStatus.ACCEPTED;
7778

7879
// debounced duplicate issues swr
7980
const { duplicateIssues } = useDebouncedDuplicateIssues(
@@ -262,6 +263,7 @@ export const InboxIssueMainContent = observer(function InboxIssueMainContent(pro
262263
issueOperations={issueOperations}
263264
isEditable={isEditable}
264265
duplicateIssueDetails={inboxIssue?.duplicate_issue_detail}
266+
isIntakeAccepted={isIntakeAccepted}
265267
/>
266268

267269
<IssueActivity workspaceSlug={workspaceSlug} projectId={projectId} issueId={issue.id} isIntakeIssue />

apps/web/core/components/inbox/sidebar/root.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ export const InboxSidebar = observer(function InboxSidebar(props: IInboxSidebarP
137137
title={t("common_empty_state.search.title")}
138138
description={t("common_empty_state.search.description")}
139139
assetClassName="size-20"
140+
rootClassName="px-page-x"
140141
/>
141142
) : currentTab === EInboxIssueCurrentTab.OPEN ? (
142143
<EmptyStateDetailed
@@ -151,6 +152,7 @@ export const InboxSidebar = observer(function InboxSidebar(props: IInboxSidebarP
151152
variant: "primary",
152153
},
153154
]}
155+
rootClassName="px-page-x"
154156
/>
155157
) : (
156158
// TODO: Add translation

0 commit comments

Comments
 (0)