Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WEB-2381 Chore: intake refactor #5752

Draft
wants to merge 6 commits into
base: preview
Choose a base branch
from
+385 −33
Draft

WEB-2381 Chore: intake refactor #5752

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9a5d06b
chore: intake emails and forms
gakshita Sep 17, 2024
3a75b8f
Merge branch 'preview' of https://github.com/makeplane/plane into cho…
gakshita Oct 4, 2024
252698e
fix: moved files to ee
gakshita Oct 4, 2024
44e7b70
fix: intake form ui
gakshita Oct 4, 2024
e3908a3
Merge branch 'preview' of https://github.com/makeplane/plane into cho…
gakshita Oct 17, 2024
6ce5ab0
fix: settings apis integrated
gakshita Oct 18, 2024
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
3 changes: 2 additions & 1 deletion packages/ui/src/popovers/popover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export const Popover = (props: TPopover) => {
panelClassName = "",
children,
popoverButtonRef,
buttonRefClassName = "",
} = props;
// states
const [referenceElement, setReferenceElement] = useState<HTMLDivElement | null>(null);
Expand All @@ -38,7 +39,7 @@ export const Popover = (props: TPopover) => {

return (
<HeadlessReactPopover className={cn("relative flex h-full w-full items-center justify-center", popoverClassName)}>
<div ref={setReferenceElement} className="w-full">
<div ref={setReferenceElement} className={cn("w-full", buttonRefClassName)}>
<HeadlessReactPopover.Button
ref={popoverButtonRef as Ref<HTMLButtonElement>}
className={cn(
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/popovers/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export type TPopoverButtonDefaultOptions = {
// button and button styling
button?: ReactNode;
buttonClassName?: string;
buttonRefClassName?: string;
disabled?: boolean;
};

Expand Down
2 changes: 1 addition & 1 deletion web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/inbox/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// components
import { AppHeader, ContentWrapper } from "@/components/core";
import { ProjectInboxHeader } from "./header";
import { ProjectInboxHeader } from "@/plane-web/components/projects/settings/intake";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

Incorrect import path for ProjectInboxHeader component.

The ProjectInboxHeader component is located at web/ce/components/projects/settings/intake/header.tsx, but the import statement in layout.tsx uses the path @/plane-web/components/projects/settings/intake. Unless there is an index.ts file in the intake directory that re-exports ProjectInboxHeader, this import path is incorrect.

Recommendations:

  • Update the import path to @/ce/components/projects/settings/intake/header to accurately reflect the component's location.
  • Alternatively, add an index.ts file in the intake directory that re-exports ProjectInboxHeader, allowing the current import path to remain valid.
🔗 Analysis chain

Approve the change to absolute import, but clarification needed.

The switch from a relative import to an absolute import is a good practice that can improve code maintainability. However, I have a couple of questions:

  1. The new import path includes "settings" (@/plane-web/components/projects/settings/intake). Is this the correct location for a component used in the inbox layout? It seems counterintuitive to have an inbox-related component in a settings folder.

  2. How does this change relate to the PR objective of "enabling issues to be added to the intake system through emails and forms"? The current modification doesn't seem to directly address this feature.

To ensure the component is in the correct location, please run the following command:

This will help us confirm that the import path is correct and the component is appropriately placed in the project structure.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Verify the existence and location of the ProjectInboxHeader component
fd ProjectInboxHeader.tsx --type f

Length of output: 36

Script:

#!/bin/bash
# Perform a case-insensitive search for ProjectInboxHeader.tsx
fd -i "ProjectInboxHeader.tsx" --type f

# Additionally, search for the component definition in .tsx files
rg "export\s+const\s+ProjectInboxHeader" --type=tsx

Length of output: 121

Script:

#!/bin/bash
# Perform a case-insensitive search for ProjectInboxHeader.tsx
fd -i "ProjectInboxHeader.tsx" --type f

# Additionally, search for the component definition in .tsx files using a glob pattern
rg "export\s+const\s+ProjectInboxHeader" -g "*.tsx"

Length of output: 202


export default function ProjectInboxIssuesLayout({ children }: { children: React.ReactNode }) {
return (
Expand Down
0 ...cts/(detail)/[projectId]/inbox/header.tsx → ...nents/projects/settings/intake/header.tsx
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions web/ce/components/projects/settings/intake/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "./header";
25 changes: 16 additions & 9 deletions web/ce/constants/project/settings/features.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
import { ReactNode } from "react";
import { FileText, Layers, Timer } from "lucide-react";
import { FileText, Layers, ListTodo, Mail, Timer, Zap } from "lucide-react";

Check warning on line 2 in web/ce/constants/project/settings/features.tsx

View workflow job for this annotation

GitHub Actions / lint-web 

'ListTodo' is defined but never used
import { ContrastIcon, DiceIcon, Intake } from "@plane/ui";
import { IProject } from "@plane/types";

Check failure on line 4 in web/ce/constants/project/settings/features.tsx

View workflow job for this annotation

GitHub Actions / lint-web 

`@plane/types` import should occur before import of `@plane/ui`

export type TProperties = {
property: string;
title: string;
description: string;
icon: ReactNode;
isPro: boolean;
isEnabled: boolean;
renderChildren?: (
currentProjectDetails: IProject,
isAdmin: boolean,
handleSubmit: (featureKey: string, featureProperty: string) => Promise<void>
) => ReactNode;
};
export type TFeatureList = {
[key: string]: {
property: string;
title: string;
description: string;
icon: ReactNode;
isPro: boolean;
isEnabled: boolean;
};
[key: string]: TProperties;
};

export type TProjectFeatures = {
Expand Down
51 changes: 30 additions & 21 deletions web/core/components/project/settings/features-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,31 +70,40 @@ export const ProjectFeaturesList: FC<Props> = observer((props) => {
return (
<div
key={featureItemKey}
className="flex items-center justify-between gap-x-8 gap-y-2 border-b border-custom-border-100 bg-custom-background-100 pb-2 pt-4 last:border-b-0"
className="gap-x-8 gap-y-2 border-b border-custom-border-100 bg-custom-background-100 pb-2 pt-4"
>
<div className="flex items-start gap-3">
<div className="flex items-center justify-center rounded bg-custom-background-90 p-3">
{featureItem.icon}
</div>
<div>
<div className="flex items-center gap-2">
<h4 className="text-sm font-medium leading-5">{featureItem.title}</h4>
{featureItem.isPro && (
<Tooltip tooltipContent="Pro feature" position="top">
<UpgradeBadge />
</Tooltip>
)}
<div key={featureItemKey} className="flex items-center justify-between">
<div className="flex items-start gap-3">
<div className="flex items-center justify-center rounded bg-custom-background-90 p-3">
{featureItem.icon}
</div>
<div>
<div className="flex items-center gap-2">
<h4 className="text-sm font-medium leading-5">{featureItem.title}</h4>
{featureItem.isPro && (
<Tooltip tooltipContent="Pro feature" position="top">
<UpgradeBadge />
</Tooltip>
)}
</div>
<p className="text-sm leading-5 tracking-tight text-custom-text-300">
{featureItem.description}
</p>
</div>
<p className="text-sm leading-5 tracking-tight text-custom-text-300">{featureItem.description}</p>
</div>
</div>

<ToggleSwitch
value={Boolean(currentProjectDetails?.[featureItem.property as keyof IProject])}
onChange={() => handleSubmit(featureItemKey, featureItem.property)}
disabled={!featureItem.isEnabled || !isAdmin}
size="sm"
/>
<ToggleSwitch
value={Boolean(currentProjectDetails?.[featureItem.property as keyof IProject])}
onChange={() => handleSubmit(featureItemKey, featureItem.property)}
disabled={!featureItem.isEnabled || !isAdmin}
size="sm"
/>
</div>
<div className="pl-14">
{currentProjectDetails?.[featureItem.property as keyof IProject] &&
featureItem.renderChildren &&
featureItem.renderChildren(currentProjectDetails, isAdmin, handleSubmit)}
</div>
</div>
);
})}
Expand Down
1 change: 1 addition & 0 deletions web/ee/components/projects/settings/intake/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "ce/components/projects/settings/intake";
Loading