Skip to content

Open-source and local-first Slack and Notion alternative that puts you in control of your data

Improve view create dialog

Hakan Shehu32ef591ca097
diff --git a/apps/desktop/src/renderer/components/databases/view-create-dialog.tsx b/apps/desktop/src/renderer/components/databases/view-create-dialog.tsx
index c7caceb8..d027ab78 100644
--- a/apps/desktop/src/renderer/components/databases/view-create-dialog.tsx
+++ b/apps/desktop/src/renderer/components/databases/view-create-dialog.tsx
@@ -28,6 +28,7 @@ import { toast } from '@/renderer/hooks/use-toast';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { Calendar, Columns, Table } from 'lucide-react';
+import { FieldAttributes, FieldType } from '@colanode/core';
const formSchema = z.object({
name: z.string().min(3, 'Name must be at least 3 characters long.'),
@@ -59,6 +60,9 @@ const viewTypes: ViewTypeOption[] = [
},
];
+const boardGroupFields: FieldType[] = ['select'];
+const calendarGroupFields: FieldType[] = ['date', 'createdAt'];
+
interface ViewCreateDialogProps {
open: boolean;
onOpenChange: (open: boolean) => void;
@@ -81,6 +85,17 @@ export const ViewCreateDialog = ({
});
const type = form.watch('type');
+ let groupByFields: FieldAttributes[] | null = null;
+ if (type === 'board') {
+ groupByFields = database.fields.filter((field) =>
+ boardGroupFields.includes(field.type)
+ );
+ } else if (type === 'calendar') {
+ groupByFields = database.fields.filter((field) =>
+ calendarGroupFields.includes(field.type)
+ );
+ }
+
const handleCancel = () => {
form.reset();
onOpenChange(false);
@@ -177,7 +192,10 @@ export const ViewCreateDialog = ({
? 'border-gray-500 text-primary'
: ''
)}
- onClick={() => field.onChange(viewType.type)}
+ onClick={() => {
+ field.onChange(viewType.type);
+ form.setValue('groupBy', null);
+ }}
>
<viewType.icon />
<p>{viewType.name}</p>
@@ -186,7 +204,7 @@ export const ViewCreateDialog = ({
</div>
)}
/>
- {type === 'board' && (
+ {groupByFields && (
<FormField
control={form.control}
name="groupBy"
@@ -195,9 +213,7 @@ export const ViewCreateDialog = ({
<FormLabel>Group by</FormLabel>
<FormControl>
<FieldSelect
- fields={database.fields.filter(
- (field) => field.type === 'select'
- )}
+ fields={groupByFields}
value={field.value ?? null}
onChange={field.onChange}
/>
@@ -207,28 +223,6 @@ export const ViewCreateDialog = ({
)}
/>
)}
- {type === 'calendar' && (
- <FormField
- control={form.control}
- name="groupBy"
- render={({ field }) => (
- <FormItem>
- <FormLabel>Group by</FormLabel>
- <FormControl>
- <FieldSelect
- fields={database.fields.filter(
- (field) =>
- field.type === 'date' ||
- field.type === 'createdAt'
- )}
- value={field.value ?? null}
- onChange={field.onChange}
- />
- </FormControl>
- </FormItem>
- )}
- />
- )}
</div>
<DialogFooter>
<Button type="button" variant="outline" onClick={handleCancel}>