Commitd32a5e1

authored

fix: fix UI bugs for orgs (#16302)

resolvescoder/internal#288resolvescoder/internal#287Fixes alignment issue on create organizations page when license banneris visible.before<img width="1178" alt="Screenshot 2025-01-27 at 18 36 35"src="https://github.com/user-attachments/assets/b845f1df-adb3-4876-aba5-8fa9d56eb22b"/>after<img width="961" alt="Screenshot 2025-01-27 at 18 47 06"src="https://github.com/user-attachments/assets/4a6374f9-9571-453c-9258-9cc4631afb77"/>

1 parent1336925 commitd32a5e1Copy full SHA for d32a5e1

File tree

+15

-6

lines changed

+15

-6

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,12 @@ const OrganizationsSettingsNavigation: FC<`
`86`	`86`	`return<Loader/>;`
`87`	`87`	`}`
`88`	`88`
	`89`	`+// Sort organizations to put active organization first`
	`90`	`+constsortedOrganizations=[`
	`91`	`+activeOrganization,`
	`92`	`+...organizations.filter((org)=>org.id!==activeOrganization.id),`
	`93`	`+];`
	`94`	`+`
`89`	`95`	`const[isPopoverOpen,setIsPopoverOpen]=useState(false);`
`90`	`96`	`constnavigate=useNavigate();`
`91`	`97`
`@@ -117,9 +123,9 @@ const OrganizationsSettingsNavigation: FC<`
`117`	`123`	`<Commandloop>`
`118`	`124`	`<CommandList>`
`119`	`125`	`<CommandGroupclassName="pb-2">`
`120`		`-{organizations.length>1&&(`
	`126`	`+{sortedOrganizations.length>1&&(`
`121`	`127`	`<divclassName="flex flex-col max-h-[260px] overflow-y-auto">`
`122`		`-{organizations.map((organization)=>(`
	`128`	`+{sortedOrganizations.map((organization)=>(`
`123`	`129`	`<CommandItem`
`124`	`130`	`key={organization.id}`
`125`	`131`	`value={organization.name}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ const CreateOrganizationPage: FC = () => {`
`18`	`18`	`consterror=createOrganizationMutation.error;`
`19`	`19`
`20`	`20`	`return(`
`21`		`-<mainclassName="py-20 sm:py-7">`
	`21`	`+<mainclassName="py-7">`
`22`	`22`	`<CreateOrganizationPageView`
`23`	`23`	`error={error}`
`24`	`24`	`isEntitled={feats.multiple_organizations}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ export const CreateOrganizationPageView: FC<`
`64`	`64`
`65`	`65`	`return(`
`66`	`66`	`<divclassName="flex flex-row font-medium">`
`67`		`-<divclassName="absolutetop-40left-12">`
	`67`	`+<divclassName="absolute left-12">`
`68`	`68`	`<Link`
`69`	`69`	`to="/organizations"`
`70`	`70`	`className="flex flex-row items-center gap-2 no-underline text-content-secondary hover:text-content-primary"`
`@@ -73,7 +73,7 @@ export const CreateOrganizationPageView: FC<`
`73`	`73`	`Go Back`
`74`	`74`	`</Link>`
`75`	`75`	`</div>`
`76`		`-<divclassName="flex flex-col gap-4 w-full min-w-72 mx-auto">`
	`76`	`+<divclassName="flex flex-col gap-4 w-full min-w-96 mx-auto">`
`77`	`77`	`<divclassName="flex flex-col items-center">`
`78`	`78`	`{Boolean(error)&&!isApiValidationError(error)&&(`
`79`	`79`	`<divcss={{marginBottom:32}}>`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,10 @@ const OrganizationProvisionersPage: FC = () => {`
`29`	`29`	`<>`
`30`	`30`	`<Helmet>`
`31`	`31`	`<title>`
`32`		`-{pageTitle("Members",organization.display_name\|\|organization.name)}`
	`32`	`+{pageTitle(`
	`33`	`+"Provisioners",`
	`34`	`+organization.display_name\|\|organization.name,`
	`35`	`+)}`
`33`	`36`	`</title>`
`34`	`37`	`</Helmet>`
`35`	`38`	`<OrganizationProvisionersPageView`

Comments

(0)