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

Add translation and fix ts issues

Browse Source
This commit is contained in:
Owen
2025-06-10 18:34:04 -04:00
parent d66739f69e
commit 3c2ea1a75f
9 changed files with 167 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/[orgId]/settings/access/invitations/InvitationsTable.tsx
View File

@@ -148,7 +148,7 @@ export default function InvitationsTable({
dialog={
<div className="space-y-4">
<p>
{t('inviteQuestionRemove', {email: selectedInvitation?.email})}
{t('inviteQuestionRemove', {email: selectedInvitation?.email || ""})}
</p>
<p>
{t('inviteMessageRemove')}

2
src/app/[orgId]/settings/access/invitations/RegenerateInvitationForm.tsx
View File

@@ -177,7 +177,7 @@ export default function RegenerateInvitationForm({
{!inviteLink ? (
<div>
<p>
{t('inviteQuestionRegenerate', {email: invitation?.email})}
{t('inviteQuestionRegenerate', {email: invitation?.email || ""})}
</p>
<div className="flex items-center space-x-2 mt-4">
<Checkbox

4
src/app/[orgId]/settings/access/users/UsersTable.tsx
View File

@@ -222,7 +222,7 @@ export default function UsersTable({ users: u }: UsersTableProps) {
toast({
variant: "default",
title: t('userOrgRemoved'),
description: t('userOrgRemovedDescription', {email: selectedUser.email})
description: t('userOrgRemovedDescription', {email: selectedUser.email || ""})
});
setUsers((prev) =>
@@ -244,7 +244,7 @@ export default function UsersTable({ users: u }: UsersTableProps) {
dialog={
<div className="space-y-4">
<p>
{t('userQuestionOrgRemove', {email: selectedUser?.email || selectedUser?.name || selectedUser?.username})}
{t('userQuestionOrgRemove', {email: selectedUser?.email || selectedUser?.name || selectedUser?.username || ""})}
</p>
<p>

101
src/app/[orgId]/settings/resources/[resourceId]/general/page.tsx
View File

@@ -71,7 +71,6 @@ const TransferFormSchema = z.object({
siteId: z.number()
});
type GeneralFormValues = z.infer<typeof GeneralFormSchema>;
type TransferFormValues = z.infer<typeof TransferFormSchema>;
export default function GeneralForm() {
@@ -123,7 +122,7 @@ export default function GeneralForm() {
return true;
},
{
message: t('proxyErrorInvalidPort'),
message: t("proxyErrorInvalidPort"),
path: ["proxyPort"]
}
)
@@ -135,11 +134,13 @@ export default function GeneralForm() {
return true;
},
{
message: t('subdomainErrorInvalid'),
message: t("subdomainErrorInvalid"),
path: ["subdomain"]
}
);
type GeneralFormValues = z.infer<typeof GeneralFormSchema>;
const form = useForm<GeneralFormValues>({
resolver: zodResolver(GeneralFormSchema),
defaultValues: {
@@ -176,8 +177,11 @@ export default function GeneralForm() {
.catch((e) => {
toast({
variant: "destructive",
title: t('domainErrorFetch'),
description: formatAxiosError(e, t('domainErrorFetchDescription'))
title: t("domainErrorFetch"),
description: formatAxiosError(
e,
t("domainErrorFetchDescription")
)
});
});
@@ -215,15 +219,18 @@ export default function GeneralForm() {
.catch((e) => {
toast({
variant: "destructive",
title: t('resourceErrorUpdate'),
description: formatAxiosError(e, t('resourceErrorUpdateDescription'))
title: t("resourceErrorUpdate"),
description: formatAxiosError(
e,
t("resourceErrorUpdateDescription")
)
});
});
if (res && res.status === 200) {
toast({
title: t('resourceUpdated'),
description: t('resourceUpdatedDescription')
title: t("resourceUpdated"),
description: t("resourceUpdatedDescription")
});
const resource = res.data.data;
@@ -251,16 +258,18 @@ export default function GeneralForm() {
.catch((e) => {
toast({
variant: "destructive",
title: t('resourceErrorTransfer'),
description: formatAxiosError(e, t('resourceErrorTransferDescription')
title: t("resourceErrorTransfer"),
description: formatAxiosError(
e,
t("resourceErrorTransferDescription")
)
});
});
if (res && res.status === 200) {
toast({
title: t('resourceTransferred'),
description: t('resourceTransferredDescription')
title: t("resourceTransferred"),
description: t("resourceTransferredDescription")
});
router.refresh();
@@ -284,10 +293,10 @@ export default function GeneralForm() {
.catch((e) => {
toast({
variant: "destructive",
title: t('resourceErrorToggle'),
title: t("resourceErrorToggle"),
description: formatAxiosError(
e,
t('resourceErrorToggleDescription')
t("resourceErrorToggleDescription")
)
});
});
@@ -302,15 +311,17 @@ export default function GeneralForm() {
<SettingsContainer>
<SettingsSection>
<SettingsSectionHeader>
<SettingsSectionTitle>{t('resourceVisibilityTitle')}</SettingsSectionTitle>
<SettingsSectionTitle>
{t("resourceVisibilityTitle")}
</SettingsSectionTitle>
<SettingsSectionDescription>
{t('resourceVisibilityTitleDescription')}
{t("resourceVisibilityTitleDescription")}
</SettingsSectionDescription>
</SettingsSectionHeader>
<SettingsSectionBody>
<SwitchInput
id="enable-resource"
label={t('resourceEnable')}
label={t("resourceEnable")}
defaultChecked={resource.enabled}
onCheckedChange={async (val) => {
await toggleResourceEnabled(val);
@@ -322,10 +333,10 @@ export default function GeneralForm() {
<SettingsSection>
<SettingsSectionHeader>
<SettingsSectionTitle>
{t('resourceGeneral')}
{t("resourceGeneral")}
</SettingsSectionTitle>
<SettingsSectionDescription>
{t('resourceGeneralDescription')}
{t("resourceGeneralDescription")}
</SettingsSectionDescription>
</SettingsSectionHeader>
@@ -342,7 +353,9 @@ export default function GeneralForm() {
name="name"
render={({ field }) => (
<FormItem>
<FormLabel>{t('name')}</FormLabel>
<FormLabel>
{t("name")}
</FormLabel>
<FormControl>
<Input {...field} />
</FormControl>
@@ -361,7 +374,9 @@ export default function GeneralForm() {
render={({ field }) => (
<FormItem>
<FormLabel>
{t('domainType')}
{t(
"domainType"
)}
</FormLabel>
<Select
value={
@@ -392,10 +407,14 @@ export default function GeneralForm() {
</FormControl>
<SelectContent>
<SelectItem value="subdomain">
{t('subdomain')}
{t(
"subdomain"
)}
</SelectItem>
<SelectItem value="basedomain">
{t('baseDomain')}
{t(
"baseDomain"
)}
</SelectItem>
</SelectContent>
</Select>
@@ -409,7 +428,7 @@ export default function GeneralForm() {
{domainType === "subdomain" ? (
<div className="w-fill space-y-2">
<FormLabel>
{t('subdomain')}
{t("subdomain")}
</FormLabel>
<div className="flex">
<div className="w-1/2">
@@ -495,7 +514,9 @@ export default function GeneralForm() {
render={({ field }) => (
<FormItem>
<FormLabel>
{t('baseDomain')}
{t(
"baseDomain"
)}
</FormLabel>
<Select
onValueChange={
@@ -549,7 +570,9 @@ export default function GeneralForm() {
render={({ field }) => (
<FormItem>
<FormLabel>
{t('resourcePortNumber')}
{t(
"resourcePortNumber"
)}
</FormLabel>
<FormControl>
<Input
@@ -589,7 +612,7 @@ export default function GeneralForm() {
disabled={saveLoading}
form="general-settings-form"
>
{t('saveGeneralSettings')}
{t("saveGeneralSettings")}
</Button>
</SettingsSectionFooter>
</SettingsSection>
@@ -597,10 +620,10 @@ export default function GeneralForm() {
<SettingsSection>
<SettingsSectionHeader>
<SettingsSectionTitle>
{t('resourceTransfer')}
{t("resourceTransfer")}
</SettingsSectionTitle>
<SettingsSectionDescription>
{t('resourceTransferDescription')}
{t("resourceTransferDescription")}
</SettingsSectionDescription>
</SettingsSectionHeader>
@@ -620,7 +643,7 @@ export default function GeneralForm() {
render={({ field }) => (
<FormItem>
<FormLabel>
{t('siteDestination')}
{t("siteDestination")}
</FormLabel>
<Popover
open={open}
@@ -645,16 +668,24 @@ export default function GeneralForm() {
site.siteId ===
field.value
)?.name
: t('siteSelect')}
: t(
"siteSelect"
)}
<CaretSortIcon className="ml-2 h-4 w-4 shrink-0 opacity-50" />
</Button>
</FormControl>
</PopoverTrigger>
<PopoverContent className="w-full p-0">
<Command>
<CommandInput placeholder={t('searchSites')} />
<CommandInput
placeholder={t(
"searchSites"
)}
/>
<CommandEmpty>
{t('sitesNotFound')}
{t(
"sitesNotFound"
)}
</CommandEmpty>
<CommandGroup>
{sites.map(
@@ -709,7 +740,7 @@ export default function GeneralForm() {
disabled={transferLoading}
form="transfer-form"
>
{t('resourceTransferSubmit')}
{t("resourceTransferSubmit")}
</Button>
</SettingsSectionFooter>
</SettingsSection>

1
src/app/[orgId]/settings/resources/[resourceId]/proxy/page.tsx
View File

@@ -74,7 +74,6 @@ import {
CollapsibleTrigger
} from "@app/components/ui/collapsible";
import { ContainersSelector } from "@app/components/ContainersSelector";
import { FaDocker } from "react-icons/fa";
import { useTranslations } from "next-intl";
const addTargetSchema = z.object({

44
src/app/[orgId]/settings/sites/[niceId]/general/page.tsx
View File

@@ -34,7 +34,6 @@ import { useState } from "react";
import { SwitchInput } from "@app/components/SwitchInput";
import { useTranslations } from "next-intl";
import Link from "next/link";
import { ArrowRight } from "lucide-react";
const GeneralFormSchema = z.object({
name: z.string().nonempty("Name is required"),
@@ -53,13 +52,6 @@ export default function GeneralPage() {
const router = useRouter();
const t = useTranslations();
const GeneralFormSchema = z.object({
name: z.string().nonempty("Name is required"),
dockerSocketEnabled: z.boolean().optional()
});
type GeneralFormValues = z.infer<typeof GeneralFormSchema>;
const form = useForm<GeneralFormValues>({
resolver: zodResolver(GeneralFormSchema),
defaultValues: {
@@ -80,10 +72,10 @@ export default function GeneralPage() {
.catch((e) => {
toast({
variant: "destructive",
title: t('siteErrorUpdate'),
title: t("siteErrorUpdate"),
description: formatAxiosError(
e,
t('siteErrorUpdateDescription')
t("siteErrorUpdateDescription")
)
});
});
@@ -94,8 +86,8 @@ export default function GeneralPage() {
});
toast({
title: t('siteUpdated'),
description: t('siteUpdatedDescription')
title: t("siteUpdated"),
description: t("siteUpdatedDescription")
});
setLoading(false);
@@ -108,10 +100,10 @@ export default function GeneralPage() {
<SettingsSection>
<SettingsSectionHeader>
<SettingsSectionTitle>
{t('generalSettings')}
{t("generalSettings")}
</SettingsSectionTitle>
<SettingsSectionDescription>
{t('siteGeneralDescription')}
{t("siteGeneralDescription")}
</SettingsSectionDescription>
</SettingsSectionHeader>
@@ -128,13 +120,13 @@ export default function GeneralPage() {
name="name"
render={({ field }) => (
<FormItem>
<FormLabel>{t('name')}</FormLabel>
<FormLabel>{t("name")}</FormLabel>
<FormControl>
<Input {...field} />
</FormControl>
<FormMessage />
<FormDescription>
{t('siteNameDescription')}
{t("siteNameDescription")}
</FormDescription>
</FormItem>
)}
@@ -148,7 +140,9 @@ export default function GeneralPage() {
<FormControl>
<SwitchInput
id="docker-socket-enabled"
label="Enable Docker Socket"
label={t(
"enableDockerSocket"
)}
defaultChecked={
field.value
}
@@ -159,10 +153,9 @@ export default function GeneralPage() {
</FormControl>
<FormMessage />
<FormDescription>
Enable Docker Socket
discovery for populating
container information,
useful in resource targets.
{t(
"enableDockerSocketDescription"
)}
<Link
href="https://docs.fossorial.io/Newt/overview#docker-socket-integration"
target="_blank"
@@ -171,10 +164,9 @@ export default function GeneralPage() {
>
<span>
{" "}
Docker socket path
must be provided to
Newt in order to use
this feature.
{t(
"enableDockerSocketLink"
)}
</span>
</Link>
</FormDescription>
@@ -194,7 +186,7 @@ export default function GeneralPage() {
loading={loading}
disabled={loading}
>
{t('saveGeneralSettings')}
{t("saveGeneralSettings")}
</Button>
</SettingsSectionFooter>
</SettingsSection>