pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-02-22 04:46:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI fixes

Browse Source
This commit is contained in:
Owen
2025-10-30 17:44:22 -07:00
parent 35c93f38e0
commit 4eb5bf08d5
3 changed files with 34 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
messages/en-US.json
View File

@@ -207,7 +207,7 @@
"alwaysAllow": "Always Allow", "alwaysAllow": "Always Allow",
"alwaysDeny": "Always Deny", "alwaysDeny": "Always Deny",
"passToAuth": "Pass to Auth", "passToAuth": "Pass to Auth",
"orgSettingsDescription": "Configure your organization's general settings", "orgSettingsDescription": "Configure your organization's settings",
"orgGeneralSettings": "Organization Settings", "orgGeneralSettings": "Organization Settings",
"orgGeneralSettingsDescription": "Manage your organization details and configuration", "orgGeneralSettingsDescription": "Manage your organization details and configuration",
"saveGeneralSettings": "Save General Settings", "saveGeneralSettings": "Save General Settings",
@@ -2080,5 +2080,6 @@
"supportSending": "Sending...", "supportSending": "Sending...",
"supportSend": "Send", "supportSend": "Send",
"supportMessageSent": "Message Sent!", "supportMessageSent": "Message Sent!",
"supportWillContact": "We'll be in touch shortly!" "supportWillContact": "We'll be in touch shortly!",
"selectLogRetention": "Select log retention"
} }

2
src/app/[orgId]/settings/general/layout.tsx
View File

@@ -72,7 +72,7 @@ export default async function GeneralSettingsPage({
<OrgProvider org={org}> <OrgProvider org={org}>
<OrgUserProvider orgUser={orgUser}> <OrgUserProvider orgUser={orgUser}>
<SettingsSectionTitle <SettingsSectionTitle
title={t('general')} title={t('orgGeneralSettings')}
description={t('orgSettingsDescription')} description={t('orgSettingsDescription')}
/> />

71
src/app/[orgId]/settings/general/page.tsx
View File

@@ -318,7 +318,7 @@ export default function GeneralPage() {
<SettingsSection> <SettingsSection>
<SettingsSectionHeader> <SettingsSectionHeader>
<SettingsSectionTitle> <SettingsSectionTitle>
{t("orgGeneralSettings")} {t("general")}
</SettingsSectionTitle> </SettingsSectionTitle>
<SettingsSectionDescription> <SettingsSectionDescription>
{t("orgGeneralSettingsDescription")} {t("orgGeneralSettingsDescription")}
@@ -420,10 +420,14 @@ export default function GeneralPage() {
} }
).map((option) => ( ).map((option) => (
<SelectItem <SelectItem
key={option.value} key={
option.value
}
value={option.value.toString()} value={option.value.toString()}
> >
{t(option.label)} {t(
option.label
)}
</SelectItem> </SelectItem>
))} ))}
</SelectContent> </SelectContent>
@@ -444,8 +448,7 @@ export default function GeneralPage() {
render={({ field }) => { render={({ field }) => {
const isDisabled = const isDisabled =
(build == "saas" && (build == "saas" &&
!subscription !subscription?.subscribed) ||
?.subscribed) ||
(build == "enterprise" && (build == "enterprise" &&
!isUnlocked()); !isUnlocked());
@@ -493,9 +496,7 @@ export default function GeneralPage() {
key={ key={
option.value option.value
} }
value={ value={option.value.toString()}
option.value.toString()
}
> >
{t( {t(
option.label option.label
@@ -517,8 +518,7 @@ export default function GeneralPage() {
render={({ field }) => { render={({ field }) => {
const isDisabled = const isDisabled =
(build == "saas" && (build == "saas" &&
!subscription !subscription?.subscribed) ||
?.subscribed) ||
(build == "enterprise" && (build == "enterprise" &&
!isUnlocked()); !isUnlocked());
@@ -566,9 +566,7 @@ export default function GeneralPage() {
key={ key={
option.value option.value
} }
value={ value={option.value.toString()}
option.value.toString()
}
> >
{t( {t(
option.label option.label
@@ -589,29 +587,20 @@ export default function GeneralPage() {
</SettingsSectionForm> </SettingsSectionForm>
</SettingsSectionBody> </SettingsSectionBody>
</SettingsSection> </SettingsSection>
</form>
</Form>
{build !== "oss" && ( {build !== "oss" && (
<SettingsSection> <SettingsSection>
<SettingsSectionHeader> <SettingsSectionHeader>
<SettingsSectionTitle> <SettingsSectionTitle>
{t("securitySettings")} {t("securitySettings")}
</SettingsSectionTitle> </SettingsSectionTitle>
<SettingsSectionDescription> <SettingsSectionDescription>
{t("securitySettingsDescription")} {t("securitySettingsDescription")}
</SettingsSectionDescription> </SettingsSectionDescription>
</SettingsSectionHeader> </SettingsSectionHeader>
<SettingsSectionBody> <SettingsSectionBody>
<SecurityFeaturesAlert /> <SettingsSectionForm>
<SecurityFeaturesAlert />
<SettingsSectionForm>
<Form {...form}>
<form
onSubmit={form.handleSubmit(onSubmit)}
className="space-y-4"
id="security-settings-form"
>
<FormField <FormField
control={form.control} control={form.control}
name="requireTwoFactor" name="requireTwoFactor"
@@ -836,12 +825,12 @@ export default function GeneralPage() {
); );
}} }}
/> />
</form> </SettingsSectionForm>
</Form> </SettingsSectionBody>
</SettingsSectionForm> </SettingsSection>
</SettingsSectionBody> )}
</SettingsSection> </form>
)} </Form>
{build === "saas" && <AuthPageSettings ref={authPageSettingsRef} />} {build === "saas" && <AuthPageSettings ref={authPageSettingsRef} />}