Commit 8951efe

committed

Merge branch 'dev' into clean_json_schema_form

2 parents ac418a7 + d0f42b0 commit 8951efeCopy full SHA for 8951efe

File tree

+20

-19

lines changed

+20

-19

lines changed

Lines changed: 14 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -188,6 +188,19 @@ const EnvironmentDetail: React.FC = () => {`
`188`	`188`	`<Level1SettingPageContent style={{ minWidth: "1000px" }}>`
`189`	`189`	`{/* Breadcrumbs */}`
`190`	`190`
	`191`	`+ <ModernBreadcrumbs`
	`192`	`+ items={[`
	`193`	`+ {`
	`194`	`+ key: 'environments',`
	`195`	`+ title: 'Environments',`
	`196`	`+ onClick: () => history.push('/setting/environments')`
	`197`	`+ },`
	`198`	`+ {`
	`199`	`+ key: 'current',`
	`200`	`+ title: environment.environmentName \|\| "Environment Detail"`
	`201`	`+ }`
	`202`	`+ ]}`
	`203`	`+ />`
`191`	`204`
`192`	`205`	`{/* Environment Header Component */}`
`193`	`206`	`<EnvironmentHeader`
`@@ -265,19 +278,7 @@ const EnvironmentDetail: React.FC = () => {`
`265`	`278`	`</Descriptions>`
`266`	`279`	`</Card>`
`267`	`280`
`268`		`- <ModernBreadcrumbs`
`269`		`- items={[`
`270`		`- {`
`271`		`- key: 'environments',`
`272`		`- title: 'Environments',`
`273`		`- onClick: () => history.push('/setting/environments')`
`274`		`- },`
`275`		`- {`
`276`		`- key: 'current',`
`277`		`- title: environment.environmentName \|\| "Environment Detail"`
`278`		`- }`
`279`		`- ]}`
`280`		`- />`
	`281`	`+`
`281`	`282`	`{/* Detailed License Information Card - only show for licensed environments with details */}`
`282`	`283`	`{environment.isLicensed && environment.licenseDetails && (`
`283`	`284`	`<Card`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,10 @@ const WorkspaceDetail: React.FC = () => {`
`159`	`159`	`return (`
`160`	`160`	`<Level1SettingPageContent style={{ minWidth: "1000px" }}>`
`161`	`161`	`{/* New Workspace Header */}`
	`162`	`+`
	`163`	`+ {/* Modern Breadcrumbs navigation */}`
	`164`	`+ <ModernBreadcrumbs items={breadcrumbItems} />`
	`165`	`+`
`162`	`166`	`<WorkspaceHeader`
`163`	`167`	`workspace={workspace}`
`164`	`168`	`environment={environment}`
`@@ -203,8 +207,7 @@ const WorkspaceDetail: React.FC = () => {`
`203`	`207`	`</Col>`
`204`	`208`	`</Row>`
`205`	`209`
`206`		`- {/* Modern Breadcrumbs navigation */}`
`207`		`- <ModernBreadcrumbs items={breadcrumbItems} />`
	`210`	`+`
`208`	`211`
`209`	`212`	`{/* Tabs for Apps, Data Sources, and Queries */}`
`210`	`213`	`<Tabs`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ const EnvironmentHeader: React.FC<EnvironmentHeaderProps> = ({`
`28`	`28`	`padding: '20px 24px',`
`29`	`29`	`borderRadius: '8px',`
`30`	`30`	`border: '1px solid #f0f0f0',`
`31`		`- boxShadow: '0 2px 8px rgba(0,0,0,0.06)'`
`32`	`31`	`}}`
`33`	`32`	`>`
`34`	`33`	`<Row justify="space-between" align="middle" gutter={[16, 16]}>`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -49,12 +49,11 @@ const ModernBreadcrumbs: React.FC<ModernBreadcrumbsProps> = ({ items = [], ...pr`
`49`	`49`
`50`	`50`	`return (`
`51`	`51`	`<div className="modern-breadcrumb" style={{`
`52`		`- background: '#f5f5f5',`
	`52`	`+ background: '#ffffff',`
`53`	`53`	`padding: '12px 20px',`
`54`	`54`	`borderRadius: '4px',`
`55`	`55`	`marginBottom: '20px',`
`56`	`56`	`border: '1px solid #e8e8e8',`
`57`		`- boxShadow: '0 1px 2px rgba(0,0,0,0.04)',`
`58`	`57`	`display: 'flex',`
`59`	`58`	`alignItems: 'center'`
`60`	`59`	`}}>`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,6 @@ const WorkspaceHeader: React.FC<WorkspaceHeaderProps> = ({`
`66`	`66`	`padding: '20px 24px',`
`67`	`67`	`borderRadius: '8px',`
`68`	`68`	`border: '1px solid #f0f0f0',`
`69`		`- boxShadow: '0 2px 8px rgba(0,0,0,0.06)'`
`70`	`69`	`}}`
`71`	`70`	`>`
`72`	`71`	`<Row justify="space-between" align="middle" gutter={[16, 16]}>`

Comments

(0)