pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-03-04 09:46:40 +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, niceId: data.niceId,
subdomain: data.subdomain, subdomain: data.subdomain,
fullDomain: updated.fullDomain, fullDomain: updated.fullDomain,
proxyPort: data.proxyPort proxyPort: data.proxyPort,
domainId: data.domainId
// ...(!resource.http && { // ...(!resource.http && {
// enableProxy: data.enableProxy // enableProxy: data.enableProxy
// }) // })
@@ -489,8 +490,14 @@ export default function GeneralForm() {
<DomainPicker <DomainPicker
orgId={orgId as string} orgId={orgId as string}
cols={1} cols={1}
defaultSubdomain={resource.subdomain} defaultSubdomain={
defaultDomainId={resource.domainId} selectedDomain?.subdomain ??
resource.subdomain
}
defaultDomainId={
selectedDomain?.domainId ??
resource.domainId
}
onDomainChange={(res) => { onDomainChange={(res) => {
const selected = { const selected = {
domainId: res.domainId, domainId: res.domainId,

17
src/components/DomainPicker.tsx
View File

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