calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-01-29 06:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

♻️ pass default value to domain picker

Browse Source
This commit is contained in:
Fred KISSIE
2025-12-17 02:36:29 +01:00
parent fccff9c23a
commit c98d61a8fb
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/[orgId]/settings/resources/proxy/[niceId]/general/page.tsx
View File

@@ -226,7 +226,8 @@ export default function GeneralForm() {
niceId: data.niceId,
subdomain: data.subdomain,
fullDomain: updated.fullDomain,
proxyPort: data.proxyPort
proxyPort: data.proxyPort,
domainId: data.domainId
// ...(!resource.http && {
// enableProxy: data.enableProxy
// })
@@ -489,8 +490,14 @@ export default function GeneralForm() {
<DomainPicker
orgId={orgId as string}
cols={1}
defaultSubdomain={resource.subdomain}
defaultDomainId={resource.domainId}
defaultSubdomain={
selectedDomain?.subdomain ??
resource.subdomain
}
defaultDomainId={
selectedDomain?.domainId ??
resource.domainId
}
onDomainChange={(res) => {
const selected = {
domainId: res.domainId,

17
src/components/DomainPicker.tsx
View File

@@ -143,6 +143,7 @@ export default function DomainPicker({
organizationDomains.find(
(domain) => domain.domainId === defaultDomainId
) ?? organizationDomains[0];
const domainOption: DomainOption = {
id: `org-${firstOrgDomain.domainId}`,
domain: firstOrgDomain.baseDomain,
@@ -156,7 +157,10 @@ export default function DomainPicker({
onDomainChange?.({
domainId: firstOrgDomain.domainId,
type: "organization",
subdomain: undefined,
subdomain:
firstOrgDomain.type !== "cname"
? defaultSubdomain || undefined
: undefined,
fullDomain: firstOrgDomain.baseDomain,
baseDomain: firstOrgDomain.baseDomain
});
@@ -177,7 +181,13 @@ export default function DomainPicker({
setSelectedBaseDomain(freeDomainOption);
}
}
}, [hideFreeDomain, loadingDomains, organizationDomains, defaultDomainId]);
}, [
loadingDomains,
organizationDomains,
defaultSubdomain,
hideFreeDomain,
defaultDomainId
]);
const checkAvailability = useCallback(
async (input: string) => {
@@ -354,7 +364,8 @@ export default function DomainPicker({
domainNamespaceId: option.domainNamespaceId,
type:
option.type === "provided-search" ? "provided" : "organization",
subdomain: sub || undefined,
subdomain:
option.domainType !== "cname" ? sub || undefined : undefined,
fullDomain,
baseDomain: option.domain
});