Skip to content
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

Use placeholder text for Provider Host input #8754

Merged
merged 1 commit into from
Mar 11, 2022
Merged

Use placeholder text for Provider Host input #8754

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
21 changes: 10 additions & 11 deletions components/dashboard/src/settings/Integrations.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ export function GitIntegrationModal(props: ({
const [providerEntry, setProviderEntry] = useState<AuthProviderEntry | undefined>(undefined);

const [type, setType] = useState<string>("GitLab");
const [host, setHost] = useState<string>("gitlab.example.com");
const [host, setHost] = useState<string>("");
const [redirectURL, setRedirectURL] = useState<string>(callbackUrl("gitlab.example.com"));
const [clientId, setClientId] = useState<string>("");
const [clientSecret, setClientSecret] = useState<string>("");
Expand All @@ -473,15 +473,6 @@ export function GitIntegrationModal(props: ({
validate();
}, [clientId, clientSecret, type])

useEffect(() => {
if (props.mode === "new") {
// If the host value has been modified e.g. not gitlab.example.com, assume it has been set by user and end operation
if (!host.includes(".example.com")) return;
const exampleHostname = `${type.toLowerCase()}.example.com`;
updateHostValue(exampleHostname);
}
}, [type]);

const onClose = () => props.onClose && props.onClose();
const onUpdate = () => props.onUpdate && props.onUpdate();

Expand Down Expand Up @@ -623,6 +614,14 @@ export function GitIntegrationModal(props: ({
</span>);
}

const getPlaceholderForIntegrationType = (type: string) => {
switch (type) {
case "GitHub": return "github.example.com";
case "GitLab": return "gitlab.example.com";
default: return "";
}
}

const copyRedirectUrl = () => {
const el = document.createElement("textarea");
el.value = redirectURL;
Expand Down Expand Up @@ -658,7 +657,7 @@ export function GitIntegrationModal(props: ({
)}
<div className="flex flex-col space-y-2">
<label htmlFor="hostName" className="font-medium">Provider Host Name</label>
<input name="hostName" disabled={mode === "edit"} type="text" value={host} className="w-full"
<input name="hostName" disabled={mode === "edit"} type="text" placeholder={getPlaceholderForIntegrationType(type)} value={host} className="w-full"
onChange={(e) => updateHostValue(e.target.value)} />
</div>
<div className="flex flex-col space-y-2">
Expand Down