Skip to content

Commit ec37cf2

Browse files
committed
2 parents aadbb09 + 937682a commit ec37cf2

8 files changed

Lines changed: 310 additions & 97 deletions

File tree

apps/console/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"preview": "vite preview"
1515
},
1616
"dependencies": {
17+
"@example/app-crm": "workspace:*",
1718
"@example/app-todo": "workspace:*",
1819
"@objectstack/client": "workspace:*",
1920
"@objectstack/client-react": "workspace:*",

apps/console/src/App.tsx

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { Toaster } from "@/components/ui/toaster"
99
import { Card, CardContent, CardHeader, CardTitle, CardDescription } from "@/components/ui/card"
1010
import { Database, Layers, Sparkles, Zap } from 'lucide-react';
1111
import { getApiBaseUrl, config } from './lib/config';
12+
import { appPackages, type AppPackage } from './mocks/browser';
1213

1314
function DashboardWelcome() {
1415
return (
@@ -121,6 +122,7 @@ export default function App() {
121122
const [selectedObject, setSelectedObject] = useState<string | null>(null);
122123
const [editingRecord, setEditingRecord] = useState<any>(null);
123124
const [showForm, setShowForm] = useState(false);
125+
const [selectedApp, setSelectedApp] = useState<AppPackage>(appPackages[0]);
124126

125127
useEffect(() => {
126128
// Use the configured API base URL based on runtime mode (MSW or Server)
@@ -152,16 +154,26 @@ export default function App() {
152154
setEditingRecord(null);
153155
}
154156

157+
function handleSelectApp(app: AppPackage) {
158+
setSelectedApp(app);
159+
setSelectedObject(null);
160+
setShowForm(false);
161+
setEditingRecord(null);
162+
}
163+
155164
return (
156165
<SidebarProvider>
157166
<AppSidebar
158167
client={client}
159168
selectedObject={selectedObject}
160-
onSelectObject={(name) => setSelectedObject(name || null)}
169+
onSelectObject={(name) => setSelectedObject(name || null)}
170+
apps={appPackages}
171+
selectedApp={selectedApp}
172+
onSelectApp={handleSelectApp}
161173
/>
162-
<main className="flex flex-1 flex-col bg-background">
163-
<SiteHeader selectedObject={selectedObject} />
164-
<div className="flex flex-1 flex-col">
174+
<main className="flex min-w-0 flex-1 flex-col bg-background">
175+
<SiteHeader selectedObject={selectedObject} appLabel={selectedApp?.label} />
176+
<div className="flex flex-1 flex-col overflow-hidden">
165177
{selectedObject ? (
166178
<div className="flex flex-1 flex-col gap-4 p-4">
167179
{client && (

apps/console/src/components/ObjectDataTable.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,12 +261,12 @@ export function ObjectDataTable({ client, objectApiName, onEdit }: ObjectDataTab
261261
</CardHeader>
262262

263263
<CardContent className="p-0">
264-
<div className="overflow-auto">
264+
<div className="overflow-x-auto">
265265
<Table>
266266
<TableHeader>
267267
<TableRow className="hover:bg-transparent">
268268
{columns.map(col => (
269-
<TableHead key={col.name} className="font-medium">
269+
<TableHead key={col.name} className="font-medium whitespace-nowrap">
270270
<div className="flex items-center gap-1.5">
271271
{col.label}
272272
<Badge variant="outline" className="text-[10px] px-1 py-0 font-normal opacity-50 hidden lg:inline-flex">
@@ -275,7 +275,7 @@ export function ObjectDataTable({ client, objectApiName, onEdit }: ObjectDataTab
275275
</div>
276276
</TableHead>
277277
))}
278-
<TableHead className="w-[60px]"></TableHead>
278+
<TableHead className="w-15 sticky right-0 bg-background"></TableHead>
279279
</TableRow>
280280
</TableHeader>
281281
<TableBody>
@@ -288,7 +288,7 @@ export function ObjectDataTable({ client, objectApiName, onEdit }: ObjectDataTab
288288
<CellValue value={record[col.name]} type={col.type} />
289289
</TableCell>
290290
))}
291-
<TableCell className="py-2.5">
291+
<TableCell className="py-2.5 sticky right-0 bg-background">
292292
<DropdownMenu>
293293
<DropdownMenuTrigger asChild>
294294
<Button

0 commit comments

Comments
 (0)