feat: move environment selector into TopBar (DS v0.1.30)
Update @cameleer/design-system to v0.1.30 which accepts ReactNode for the environment prop. Move EnvironmentSelector from standalone div into TopBar, rendering between theme toggle and user menu. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
8
ui/package-lock.json
generated
8
ui/package-lock.json
generated
@@ -8,7 +8,7 @@
|
|||||||
"name": "ui",
|
"name": "ui",
|
||||||
"version": "0.0.0",
|
"version": "0.0.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@cameleer/design-system": "^0.1.29",
|
"@cameleer/design-system": "^0.1.30",
|
||||||
"@tanstack/react-query": "^5.90.21",
|
"@tanstack/react-query": "^5.90.21",
|
||||||
"lucide-react": "^1.7.0",
|
"lucide-react": "^1.7.0",
|
||||||
"openapi-fetch": "^0.17.0",
|
"openapi-fetch": "^0.17.0",
|
||||||
@@ -278,9 +278,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@cameleer/design-system": {
|
"node_modules/@cameleer/design-system": {
|
||||||
"version": "0.1.29",
|
"version": "0.1.30",
|
||||||
"resolved": "https://gitea.siegeln.net/api/packages/cameleer/npm/%40cameleer%2Fdesign-system/-/0.1.29/design-system-0.1.29.tgz",
|
"resolved": "https://gitea.siegeln.net/api/packages/cameleer/npm/%40cameleer%2Fdesign-system/-/0.1.30/design-system-0.1.30.tgz",
|
||||||
"integrity": "sha512-Za4drshZhGqonR0QyZxDpo6UnhT+VaOCSRLIlmjRrVZD/8+E+wvjbCVO2/sX5EMCfho+x6Y6V7d4GHNwu38ioQ==",
|
"integrity": "sha512-HK8bQlp7NU1GIZAT17gjyeN/NQVDdpQiUmphFJ/f+y4nS+FsbCcI+Qtq67S9+DZeu33+7L/NFUDRVYBTjuX20w==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"lucide-react": "^1.7.0",
|
"lucide-react": "^1.7.0",
|
||||||
"react": "^19.0.0",
|
"react": "^19.0.0",
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
"generate-api:live": "curl -s http://localhost:8081/api/v1/api-docs -o src/api/openapi.json && openapi-typescript src/api/openapi.json -o src/api/schema.d.ts"
|
"generate-api:live": "curl -s http://localhost:8081/api/v1/api-docs -o src/api/openapi.json && openapi-typescript src/api/openapi.json -o src/api/schema.d.ts"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@cameleer/design-system": "^0.1.29",
|
"@cameleer/design-system": "^0.1.30",
|
||||||
"@tanstack/react-query": "^5.90.21",
|
"@tanstack/react-query": "^5.90.21",
|
||||||
"lucide-react": "^1.7.0",
|
"lucide-react": "^1.7.0",
|
||||||
"openapi-fetch": "^0.17.0",
|
"openapi-fetch": "^0.17.0",
|
||||||
|
|||||||
@@ -702,7 +702,13 @@ function LayoutContent() {
|
|||||||
<AppShell sidebar={sidebarElement}>
|
<AppShell sidebar={sidebarElement}>
|
||||||
<TopBar
|
<TopBar
|
||||||
breadcrumb={breadcrumb}
|
breadcrumb={breadcrumb}
|
||||||
environment={selectedEnv}
|
environment={environments.length > 0 ? (
|
||||||
|
<EnvironmentSelector
|
||||||
|
environments={environments}
|
||||||
|
value={selectedEnv}
|
||||||
|
onChange={setSelectedEnv}
|
||||||
|
/>
|
||||||
|
) : undefined}
|
||||||
user={username ? { name: username } : undefined}
|
user={username ? { name: username } : undefined}
|
||||||
onLogout={handleLogout}
|
onLogout={handleLogout}
|
||||||
/>
|
/>
|
||||||
@@ -717,16 +723,6 @@ function LayoutContent() {
|
|||||||
data={searchData}
|
data={searchData}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{!isAdminPage && environments.length > 0 && (
|
|
||||||
<div style={{ display: 'flex', justifyContent: 'flex-end', padding: '4px 1.5rem 0' }}>
|
|
||||||
<EnvironmentSelector
|
|
||||||
environments={environments}
|
|
||||||
value={selectedEnv}
|
|
||||||
onChange={setSelectedEnv}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{!isAdminPage && (
|
{!isAdminPage && (
|
||||||
<ContentTabs active={scope.tab} onChange={setTab} scope={scope} />
|
<ContentTabs active={scope.tab} onChange={setTab} scope={scope} />
|
||||||
)}
|
)}
|
||||||
|
|||||||
Reference in New Issue
Block a user