Skip to content

[dashboard] re-order org docker auth config #20555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 28, 2025
Merged

[dashboard] re-order org docker auth config #20555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/dashboard/src/dedicated-setup/SetupLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export const SetupLayout: FC<Props> = ({
<div className="container">
<div className="app-container">
<div className="flex justify-between items-center">
<div className="flex items-center justify-start items-center py-3 space-x-1">
<div className="flex items-center justify-start py-3 space-x-1">
<img src={gitpodIcon} className="w-6 h-6" alt="Gitpod's logo" />
{showOrg ? (
<div className="pr-1 flex font-semibold whitespace-nowrap max-w-xs overflow-hidden">
Expand All @@ -55,7 +55,7 @@ export const SetupLayout: FC<Props> = ({
)}
</div>
</div>
<div className={`mt-24 ${noMaxWidth ? "" : "max-w-md"}`}>
<div className={`mt-24 ${noMaxWidth ? "" : "max-w-md"} pb-4`}>
Copy link
Member Author

@filiptronicek filiptronicek Jan 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this drive-by fixes the spacing on the bottom of the setup page, where the "Verify SSO configuration" button had no space below it.

{/* generate the rounded dots for the progress */}
{progressCurrent !== undefined && progressTotal !== undefined ? (
<div className="flex flex-row space-x-2 mb-4">
Expand Down
44 changes: 22 additions & 22 deletions components/dashboard/src/teams/TeamSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,28 @@ export default function TeamSettingsPage() {
/>
</ConfigurationSettingsField>

{org?.id && (
<ConfigurationSettingsField>
<Heading3>Docker Registry authentication</Heading3>
<Subheading>Configure Docker registry permissions for the whole organization.</Subheading>

<NamedOrganizationEnvvarItem
disabled={!isOwner}
name={EnvVar.GITPOD_IMAGE_AUTH_ENV_VAR_NAME}
organizationId={org.id}
variable={gitpodImageAuthEnvVar}
/>
</ConfigurationSettingsField>
)}

{showImageEditModal && (
<OrgDefaultWorkspaceImageModal
settings={settings}
installationDefaultWorkspaceImage={installationDefaultImage}
onClose={() => setShowImageEditModal(false)}
/>
)}

{isCommitAnnotationEnabled && (
<ConfigurationSettingsField>
<Heading3>Insights</Heading3>
Expand Down Expand Up @@ -255,28 +277,6 @@ export default function TeamSettingsPage() {
</ConfigurationSettingsField>
)}

{showImageEditModal && (
<OrgDefaultWorkspaceImageModal
settings={settings}
installationDefaultWorkspaceImage={installationDefaultImage}
onClose={() => setShowImageEditModal(false)}
/>
)}

{org?.id && (
<ConfigurationSettingsField>
<Heading3>Docker Registry authentication</Heading3>
<Subheading>Configure Docker registry permissions for the whole organization.</Subheading>

<NamedOrganizationEnvvarItem
disabled={!isOwner}
name={EnvVar.GITPOD_IMAGE_AUTH_ENV_VAR_NAME}
organizationId={org.id}
variable={gitpodImageAuthEnvVar}
/>
</ConfigurationSettingsField>
)}

{user?.organizationId !== org?.id && isOwner && (
<ConfigurationSettingsField>
<Heading3>Delete organization</Heading3>
Expand Down
Loading