pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-02-28 15:56:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge issues

Browse Source
This commit is contained in:
Owen
2025-12-20 15:53:38 -05:00
committed by Owen Schwartz
parent ccd4f9b65c
commit 9b3d066a91
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/routers/resource/index.ts
View File

@@ -30,5 +30,4 @@ export * from "./removeRoleFromResource";
export * from "./addUserToResource"; export * from "./addUserToResource";
export * from "./removeUserFromResource"; export * from "./removeUserFromResource";
export * from "./listAllResourceNames"; export * from "./listAllResourceNames";
export * from "./getMaintenanceInfo";
export * from "./removeEmailFromResourceWhitelist"; export * from "./removeEmailFromResourceWhitelist";

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

@@ -67,7 +67,7 @@ import {
TooltipProvider, TooltipProvider,
TooltipTrigger TooltipTrigger
} from "@app/components/ui/tooltip"; } from "@app/components/ui/tooltip";
import { LicenseOrSubscriptionRequiredAlert } from "@app/components/SecurityFeaturesAlert"; import { PaidFeaturesAlert } from "@app/components/PaidFeaturesAlert";
export default function GeneralForm() { export default function GeneralForm() {
const [formKey, setFormKey] = useState(0); const [formKey, setFormKey] = useState(0);
@@ -519,7 +519,7 @@ export default function GeneralForm() {
</SettingsSectionHeader> </SettingsSectionHeader>
<SettingsSectionBody> <SettingsSectionBody>
<LicenseOrSubscriptionRequiredAlert /> <PaidFeaturesAlert />
<SettingsSectionForm> <SettingsSectionForm>
<Form {...form}> <Form {...form}>
@@ -798,6 +798,10 @@ export default function GeneralForm() {
orgId={orgId as string} orgId={orgId as string}
cols={1} cols={1}
onDomainChange={(res) => { onDomainChange={(res) => {
if (!res) {
setSelectedDomain(null);
return;
}
const selected = { const selected = {
domainId: res.domainId, domainId: res.domainId,
subdomain: res.subdomain, subdomain: res.subdomain,