Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export default function RootLayout({ children }: { children: React.ReactNode })
{`(function(c,l,a,r,i,t,y){
c[a]=c[a]||function(){(c[a].q=c[a].q||[]).push(arguments)};
t=l.createElement(r);t.async=1;t.src="https://www.clarity.ms/tag/"+i;
y=l.getElementsByTagName(r)[0];y.parentNode.insertBefore(t,y);
y=l.getElementsByTagName(r)[0];if(y){y.parentNode.insertBefore(t,y);}
})(window, document, "clarity", "script", "${process.env.NEXT_PUBLIC_SESSION_RECORDER_KEY}");`}
</Script>
)}
Expand Down
1 change: 1 addition & 0 deletions web/ce/components/issues/issue-details/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
export * from "./issue-identifier";
export * from "./issue-properties-activity";
export * from "./issue-type-switcher";
24 changes: 24 additions & 0 deletions web/ce/components/issues/issue-details/issue-type-switcher.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { observer } from "mobx-react";
// store hooks
import { useIssueDetail } from "@/hooks/store";
// plane web components
import { IssueIdentifier } from "@/plane-web/components/issues";

export type TIssueTypeSwitcherProps = {
issueId: string;
disabled: boolean;
};

export const IssueTypeSwitcher: React.FC<TIssueTypeSwitcherProps> = observer((props) => {
const { issueId } = props;
// store hooks
const {
issue: { getIssueById },
} = useIssueDetail();
// derived values
const issue = getIssueById(issueId);

if (!issue || !issue.project_id) return <></>;

return <IssueIdentifier issueId={issueId} projectId={issue.project_id} size="md" />;
});
8 changes: 3 additions & 5 deletions web/core/components/issues/issue-detail/main-content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

import { useEffect, useState } from "react";
import { observer } from "mobx-react";
// types
import { TIssue } from "@plane/types";
// components
import {
IssueActivity,
Expand All @@ -20,7 +18,7 @@ import { useIssueDetail, useUser } from "@/hooks/store";
import useReloadConfirmations from "@/hooks/use-reload-confirmation";
import useSize from "@/hooks/use-window-size";
// plane web components
import { IssueIdentifier } from "@/plane-web/components/issues";
import { IssueTypeSwitcher } from "@/plane-web/components/issues";
// types
import { TIssueOperations } from "./root";

Expand Down Expand Up @@ -68,8 +66,8 @@ export const IssueMainContent: React.FC<Props> = observer((props) => {
/>
)}

<div className="mb-2.5 flex items-center gap-4">
<IssueIdentifier issueId={issueId} projectId={issue.project_id} size="md" />
<div className="mb-2.5 flex items-center justify-between gap-4">
<IssueTypeSwitcher issueId={issueId} disabled={isArchived || !isEditable} />
<IssueUpdateStatus isSubmitting={isSubmitting} />
</div>

Expand Down
4 changes: 3 additions & 1 deletion web/core/components/issues/issue-modal/base.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export const CreateUpdateIssueModalBase: React.FC<IssuesModalProps> = observer((
withDraftIssueWrapper = true,
storeType: issueStoreFromProps,
isDraft = false,
fetchIssueDetails = true,
} = props;
const issueStoreType = useIssueStoreType();

Expand Down Expand Up @@ -68,7 +69,8 @@ export const CreateUpdateIssueModalBase: React.FC<IssuesModalProps> = observer((
setDescription(undefined);
if (!workspaceSlug) return;

if (!projectId || issueId === undefined) {
if (!projectId || issueId === undefined || !fetchIssueDetails) {
// Set description to the issue description from the props if available
setDescription(data?.description_html || "<p></p>");
return;
}
Expand Down
8 changes: 1 addition & 7 deletions web/core/components/issues/issue-modal/form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,6 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
useEffect(() => {
const issueTypeId = watch("type_id");

// if data is present, set active type id to the type id of the issue
if (data && data.type_id) {
setValue("type_id", data.type_id, { shouldValidate: true });
return;
}

// if issue type id is present or project not available, return
if (issueTypeId || !projectId) return;

Expand Down Expand Up @@ -284,7 +278,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
<IssueTypeSelect
control={control}
projectId={projectId}
disabled={!!data?.id || !!data?.sourceIssueId}
disabled={!!data?.sourceIssueId}
handleFormChange={handleFormChange}
/>
)}
Expand Down
14 changes: 9 additions & 5 deletions web/core/components/issues/issue-modal/modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,14 @@ export interface IssuesModalProps {
withDraftIssueWrapper?: boolean;
storeType?: EIssuesStoreType;
isDraft?: boolean;
fetchIssueDetails?: boolean;
}

export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = observer((props) => (
<IssueModalProvider>
<CreateUpdateIssueModalBase {...props} />
</IssueModalProvider>
));
export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = observer(
(props) =>
props.isOpen && (
<IssueModalProvider>
<CreateUpdateIssueModalBase {...props} />
</IssueModalProvider>
)
);
9 changes: 5 additions & 4 deletions web/core/components/issues/peek-overview/issue-detail.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import { FC, useEffect } from "react";
import { observer } from "mobx-react";
// store hooks
// components
import { TIssueOperations } from "@/components/issues";
// store hooks
import { useIssueDetail, useUser } from "@/hooks/store";
// hooks
import useReloadConfirmations from "@/hooks/use-reload-confirmation";
// plane web components
import { IssueIdentifier } from "@/plane-web/components/issues";
// components
import { IssueTypeSwitcher } from "@/plane-web/components/issues";
// local components
import { IssueDescriptionInput } from "../description-input";
import { IssueReaction } from "../issue-detail/reactions";
import { IssueTitleInput } from "../title-input";
Expand Down Expand Up @@ -56,7 +57,7 @@ export const PeekOverviewIssueDetails: FC<IPeekOverviewIssueDetails> = observer(

return (
<div className="space-y-2">
<IssueIdentifier issueId={issueId} projectId={issue.project_id} size="md" />
<IssueTypeSwitcher issueId={issueId} disabled={isArchived || disabled} />
<IssueTitleInput
workspaceSlug={workspaceSlug}
projectId={issue.project_id}
Expand Down
1 change: 1 addition & 0 deletions web/ee/components/issues/issue-details/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
export * from "./issue-identifier";
export * from "./issue-properties-activity";
export * from "./issue-type-switcher";
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "ce/components/issues/issue-details/issue-type-switcher";