#25 - edit report name (quick fix)
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';
|
import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';
|
||||||
|
import EditReportName from '@/components/report/edit-report-name';
|
||||||
import { Pencil } from 'lucide-react';
|
import { Pencil } from 'lucide-react';
|
||||||
import { notFound } from 'next/navigation';
|
import { notFound } from 'next/navigation';
|
||||||
|
|
||||||
@@ -27,12 +28,7 @@ export default async function Page({
|
|||||||
<>
|
<>
|
||||||
<PageLayout
|
<PageLayout
|
||||||
organizationSlug={organizationSlug}
|
organizationSlug={organizationSlug}
|
||||||
title={
|
title={<EditReportName name={report.name} />}
|
||||||
<div className="flex cursor-pointer items-center gap-2">
|
|
||||||
{report.name}
|
|
||||||
<Pencil size={16} />
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
/>
|
/>
|
||||||
<ReportEditor report={report} />
|
<ReportEditor report={report} />
|
||||||
</>
|
</>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';
|
import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';
|
||||||
|
import EditReportName from '@/components/report/edit-report-name';
|
||||||
import { Pencil } from 'lucide-react';
|
import { Pencil } from 'lucide-react';
|
||||||
|
|
||||||
import ReportEditor from './report-editor';
|
import ReportEditor from './report-editor';
|
||||||
@@ -15,12 +16,7 @@ export default function Page({ params: { organizationSlug } }: PageProps) {
|
|||||||
<>
|
<>
|
||||||
<PageLayout
|
<PageLayout
|
||||||
organizationSlug={organizationSlug}
|
organizationSlug={organizationSlug}
|
||||||
title={
|
title={<EditReportName name={undefined} />}
|
||||||
<div className="flex cursor-pointer items-center gap-2">
|
|
||||||
Unnamed report
|
|
||||||
<Pencil size={16} />
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
/>
|
/>
|
||||||
<ReportEditor report={null} />
|
<ReportEditor report={null} />
|
||||||
</>
|
</>
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import {
|
|||||||
changeStartDate,
|
changeStartDate,
|
||||||
ready,
|
ready,
|
||||||
reset,
|
reset,
|
||||||
|
setName,
|
||||||
setReport,
|
setReport,
|
||||||
} from '@/components/report/reportSlice';
|
} from '@/components/report/reportSlice';
|
||||||
import { ReportSidebar } from '@/components/report/sidebar/ReportSidebar';
|
import { ReportSidebar } from '@/components/report/sidebar/ReportSidebar';
|
||||||
@@ -21,6 +22,7 @@ import { Button } from '@/components/ui/button';
|
|||||||
import { Sheet, SheetContent, SheetTrigger } from '@/components/ui/sheet';
|
import { Sheet, SheetContent, SheetTrigger } from '@/components/ui/sheet';
|
||||||
import { useAppParams } from '@/hooks/useAppParams';
|
import { useAppParams } from '@/hooks/useAppParams';
|
||||||
import { useDispatch, useSelector } from '@/redux';
|
import { useDispatch, useSelector } from '@/redux';
|
||||||
|
import { bind } from 'bind-event-listener';
|
||||||
import { endOfDay, startOfDay } from 'date-fns';
|
import { endOfDay, startOfDay } from 'date-fns';
|
||||||
import { GanttChartSquareIcon } from 'lucide-react';
|
import { GanttChartSquareIcon } from 'lucide-react';
|
||||||
|
|
||||||
@@ -50,6 +52,17 @@ export default function ReportEditor({
|
|||||||
};
|
};
|
||||||
}, [initialReport, dispatch]);
|
}, [initialReport, dispatch]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
return bind(window, {
|
||||||
|
type: 'report-name-change',
|
||||||
|
listener: (event) => {
|
||||||
|
if (event instanceof CustomEvent && typeof event.detail === 'string') {
|
||||||
|
dispatch(setName(event.detail));
|
||||||
|
}
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}, [dispatch]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Sheet>
|
<Sheet>
|
||||||
<StickyBelowHeader className="grid grid-cols-2 gap-2 p-4 md:grid-cols-6">
|
<StickyBelowHeader className="grid grid-cols-2 gap-2 p-4 md:grid-cols-6">
|
||||||
|
|||||||
65
apps/dashboard/src/components/report/edit-report-name.tsx
Normal file
65
apps/dashboard/src/components/report/edit-report-name.tsx
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
'use client';
|
||||||
|
|
||||||
|
import { useState } from 'react';
|
||||||
|
import { PencilIcon } from 'lucide-react';
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
name?: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
const EditReportName = ({ name }: Props) => {
|
||||||
|
const [isEditing, setIsEditing] = useState(false);
|
||||||
|
const [newName, setNewName] = useState(name);
|
||||||
|
|
||||||
|
const onSubmit = () => {
|
||||||
|
if (newName === name) {
|
||||||
|
return setIsEditing(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (newName === '') {
|
||||||
|
setNewName(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
window.dispatchEvent(
|
||||||
|
new CustomEvent('report-name-change', {
|
||||||
|
detail: newName === '' ? name : newName,
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
setIsEditing(false);
|
||||||
|
};
|
||||||
|
|
||||||
|
if (isEditing) {
|
||||||
|
return (
|
||||||
|
<div className="flex">
|
||||||
|
<input
|
||||||
|
// eslint-disable-next-line jsx-a11y/no-autofocus
|
||||||
|
autoFocus
|
||||||
|
type="text"
|
||||||
|
value={newName}
|
||||||
|
onKeyDown={(e) => {
|
||||||
|
if (e.key === 'Enter') {
|
||||||
|
e.preventDefault();
|
||||||
|
e.stopPropagation();
|
||||||
|
onSubmit();
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
onChange={(e) => setNewName(e.target.value)}
|
||||||
|
onBlur={() => onSubmit()}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<button
|
||||||
|
className="flex cursor-pointer select-none items-center gap-2"
|
||||||
|
onClick={() => setIsEditing(true)}
|
||||||
|
>
|
||||||
|
{newName ?? 'Unnamed Report'}
|
||||||
|
<PencilIcon size={16} />
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default EditReportName;
|
||||||
@@ -38,7 +38,7 @@ const initialState: InitialState = {
|
|||||||
dirty: false,
|
dirty: false,
|
||||||
// TODO: remove this
|
// TODO: remove this
|
||||||
projectId: '',
|
projectId: '',
|
||||||
name: 'Untitled',
|
name: '',
|
||||||
chartType: 'linear',
|
chartType: 'linear',
|
||||||
lineType: 'monotone',
|
lineType: 'monotone',
|
||||||
interval: 'day',
|
interval: 'day',
|
||||||
|
|||||||
Reference in New Issue
Block a user