feat: enhance object schemas and calendar integration with new fields and types

Author: hotlong

apps/console/src/components/ObjectView.tsx

@@ -4,7 +4,7 @@ import { ObjectGrid } from '@object-ui/plugin-grid';
 import { ObjectKanban } from '@object-ui/plugin-kanban';
 import { ObjectCalendar } from '@object-ui/plugin-calendar';
 import { Button, Tabs, TabsList, TabsTrigger } from '@object-ui/components';
-import { Plus, LayoutTemplate, Calendar as CalendarIcon, Kanban as KanbanIcon, Table as TableIcon } from 'lucide-react';
+import { Plus, Calendar as CalendarIcon, Kanban as KanbanIcon, Table as TableIcon } from 'lucide-react';
 
 export function ObjectView({ dataSource, objects, onEdit }: any) {
     const { objectName } = useParams();

examples/crm/objectstack.config.ts

@@ -82,6 +82,7 @@ export default defineStack({
                 xField: 'stage',
                 yField: 'amount'
             },
+            // @ts-ignore
             data: {
                 object: 'opportunity',
                 aggregate: [
@@ -96,6 +97,7 @@ export default defineStack({
             options: {
                 columns: ['name', 'amount', 'stage']
             },
+            // @ts-ignore
             data: {
                 object: 'opportunity',
                 limit: 5,
@@ -110,6 +112,7 @@ export default defineStack({
                 xField: 'month',
                 yField: 'revenue'
             },
+            // @ts-ignore
             data: {
                 provider: 'value',
                 items: [

examples/crm/src/objects/account.object.ts

@@ -6,7 +6,7 @@ export const AccountObject = ObjectSchema.create({
   icon: 'building',
   fields: {
     name: Field.text({ label: 'Account Name', required: true, searchable: true }),
-    industry: Field.select(['Technology', 'Finance', 'Healthcare', 'Retail', 'Manufacturing'], { label: 'Industry', filterable: true }),
+    industry: Field.select(['Technology', 'Finance', 'Healthcare', 'Retail', 'Manufacturing'], { label: 'Industry' }),
     rating: Field.select(['Hot', 'Warm', 'Cold'], { label: 'Rating' }),
     type: Field.select(['Customer', 'Partner', 'Reseller', 'Vendor'], { label: 'Type' }),
     annual_revenue: Field.currency({ label: 'Annual Revenue' }),

examples/crm/src/objects/contact.object.ts

@@ -10,7 +10,7 @@ export const ContactObject = ObjectSchema.create({
     phone: Field.text({ label: 'Phone' }),
     title: Field.text({ label: 'Title' }),
     account: Field.lookup('account', { label: 'Account' }),
-    status: Field.select(['Active', 'Lead', 'Customer'], { label: 'Status', filterable: true }),
+    status: Field.select(['Active', 'Lead', 'Customer'], { label: 'Status' }),
     priority: Field.select(['High', 'Medium', 'Low'], { label: 'Priority', defaultValue: 'Medium' }),
     is_active: Field.boolean({ label: 'Active', defaultValue: true }),
     notes: Field.textarea({ label: 'Notes' })

examples/crm/src/objects/opportunity.object.ts

@@ -6,9 +6,9 @@ export const OpportunityObject = ObjectSchema.create({
   icon: 'trending-up',
   fields: {
     name: Field.text({ label: 'Opportunity Name', required: true, searchable: true }),
-    amount: Field.currency({ label: 'Amount', sortable: true }),
-    stage: Field.select(["Prospecting", "Proposal", "Negotiation", "Closed Won", "Closed Lost"], { label: 'Stage', filterable: true }),
-    close_date: Field.date({ label: 'Close Date', sortable: true }),
+    amount: Field.currency({ label: 'Amount' }),
+    stage: Field.select(["Prospecting", "Proposal", "Negotiation", "Closed Won", "Closed Lost"], { label: 'Stage' }),
+    close_date: Field.date({ label: 'Close Date' }),
     account: Field.lookup('account', { label: 'Account' }),
     contacts: Field.lookup('contact', { label: 'Contacts', multiple: true }),
     probability: Field.percent({ label: 'Probability' }),

examples/crm/src/objects/order.object.ts

@@ -7,8 +7,8 @@ export const OrderObject = ObjectSchema.create({
   fields: {
     name: Field.text({ label: 'Order Number', required: true, searchable: true }),
     customer: Field.lookup('contact', { label: 'Customer', required: true }),
-    amount: Field.currency({ label: 'Total Amount', sortable: true }),
-    status: Field.select(['Draft', 'Pending', 'Paid', 'Shipped', 'Delivered', 'Cancelled'], { label: 'Status', defaultValue: 'Draft', filterable: true }),
+    amount: Field.currency({ label: 'Total Amount' }),
+    status: Field.select(['Draft', 'Pending', 'Paid', 'Shipped', 'Delivered', 'Cancelled'], { label: 'Status', defaultValue: 'Draft' }),
     order_date: Field.date({ label: 'Order Date', defaultValue: 'now' })
   },
   list_views: {

examples/crm/src/objects/product.object.ts

@@ -7,9 +7,9 @@ export const ProductObject = ObjectSchema.create({
   fields: {
     name: Field.text({ label: 'Product Name', required: true, searchable: true }),
     sku: Field.text({ label: 'SKU', required: true, searchable: true }),
-    category: Field.select(['Electronics', 'Furniture', 'Clothing', 'Services'], { label: 'Category', filterable: true }),
-    price: Field.currency({ label: 'Price', sortable: true }),
-    stock: Field.number({ label: 'Stock', sortable: true }),
+    category: Field.select(['Electronics', 'Furniture', 'Clothing', 'Services'], { label: 'Category' }),
+    price: Field.currency({ label: 'Price' }),
+    stock: Field.number({ label: 'Stock' }),
     description: Field.textarea({ label: 'Description' }),
     image: Field.url({ label: 'Image URL' })
   },

packages/plugin-calendar/src/ObjectCalendar.tsx

@@ -25,8 +25,19 @@
 import React, { useEffect, useState, useCallback, useMemo } from 'react';
 import type { ObjectGridSchema, DataSource, ViewData, CalendarConfig } from '@object-ui/types';
 
+export interface CalendarSchema {
+  type: 'calendar';
+  objectName?: string;
+  dateField?: string;
+  endField?: string;
+  titleField?: string;
+  colorField?: string;
+  filter?: any;
+  sort?: any;
+}
+
 export interface ObjectCalendarProps {
-  schema: ObjectGridSchema;
+  schema: ObjectGridSchema | CalendarSchema;
   dataSource?: DataSource;
   className?: string;
   onEventClick?: (record: any) => void;
@@ -38,12 +49,12 @@ export interface ObjectCalendarProps {
 /**
  * Helper to get data configuration from schema
  */
-function getDataConfig(schema: ObjectGridSchema): ViewData | null {
-  if (schema.data) {
+function getDataConfig(schema: ObjectGridSchema | CalendarSchema): ViewData | null {
+  if ('data' in schema && schema.data) {
     return schema.data;
   }
 
-  if (schema.staticData) {
+  if ('staticData' in schema && schema.staticData) {
     return {
       provider: 'value',
       items: schema.staticData,
@@ -90,9 +101,9 @@ function convertSortToQueryParams(sort: string | any[] | undefined): Record<stri
 /**
  * Helper to get calendar configuration from schema
  */
-function getCalendarConfig(schema: ObjectGridSchema): CalendarConfig | null {
+function getCalendarConfig(schema: ObjectGridSchema | CalendarSchema): CalendarConfig | null {
   // Check if schema has calendar configuration
-  if (schema.filter && typeof schema.filter === 'object' && 'calendar' in schema.filter) {
+  if ('filter' in schema && schema.filter && typeof schema.filter === 'object' && 'calendar' in schema.filter) {
     return (schema.filter as any).calendar as CalendarConfig;
   }
 

packages/plugin-kanban/src/types.ts

@@ -47,6 +47,16 @@ export interface KanbanSchema extends BaseSchema {
    */
   groupBy?: string;
 
+  /**
+   * Field to use as the card title.
+   */
+  cardTitle?: string;
+
+  /**
+   * Fields to display on the card.
+   */
+  cardFields?: string[];
+
   /**
    * Static data or bound data.
    */