Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions frontend/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const MembersPage = lazy(() => import("./pages/MembersPage").then(m => ({ defaul
const VersionsPage = lazy(() => import("./pages/VersionsPage").then(m => ({ default: m.VersionsPage })))
const VersionDetailPage = lazy(() => import("./pages/VersionDetailPage").then(m => ({ default: m.VersionDetailPage })))
const EnvironmentsPage = lazy(() => import("./pages/EnvironmentsPage").then(m => ({ default: m.EnvironmentsPage })))
const CustomFieldsPage = lazy(() => import("./pages/CustomFieldsPage").then(m => ({ default: m.CustomFieldsPage })))

const BugsPage = lazy(() => import("./pages/BugsPage").then(m => ({ default: m.BugsPage })))
const BugDetailPage = lazy(() => import("./pages/BugDetailPage").then(m => ({ default: m.BugDetailPage })))
const CoverageMatrixPage = lazy(() => import("./pages/CoverageMatrixPage").then(m => ({ default: m.CoverageMatrixPage })))
Expand Down Expand Up @@ -73,7 +73,7 @@ export default function App() {
<Route path="/projects/:id/members" element={<MembersPage />} />
<Route path="/projects/:id/versions" element={<VersionsPage />} />
<Route path="/projects/:id/environments" element={<EnvironmentsPage />} />
<Route path="/projects/:id/custom-fields" element={<CustomFieldsPage />} />
<Route path="/projects/:id/custom-fields" element={<Navigate to="../settings/custom-fields" replace />} />
<Route path="/projects/:id/settings/*" element={<ProjectSettingsPage />} />
<Route path="/projects/:id/integrations" element={<Navigate to="../settings/integrations" replace />} />
<Route path="/projects/:id/bugs" element={<BugsPage />} />
Expand Down
10 changes: 2 additions & 8 deletions frontend/src/components/integration/ExternalTrackersSection.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,11 @@ export function ExternalTrackersSection({ projectId }) {

return (
<section className="space-y-3">
<header className="flex items-center justify-between">
<div>
<h2 className="text-sm font-semibold text-gray-700 dark:text-gray-200 uppercase tracking-wide">
{t("trackers.title")}
</h2>
<p className="text-xs text-gray-500 dark:text-gray-400">{t("trackers.subtitle")}</p>
</div>
<div className="flex items-center justify-end">
<Button size="sm" variant="outline" onClick={() => setCreating(true)}>
<Plus size={14} /> {t("trackers.new")}
</Button>
</header>
</div>

{isLoading ? null : integrations.length === 0 ? (
<EmptyState
Expand Down
3 changes: 1 addition & 2 deletions frontend/src/components/layout/Sidebar.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useEffect, useRef, useState } from "react"
import { NavLink, Link, useMatch } from "react-router-dom"
import { Bug, FolderKanban, Users, LogOut, UserCircle, FolderOpen, LayoutDashboard, PlayCircle, ClipboardList, ChevronLeft, Server, ListChecks, Shield, ChevronUp, Tag, Search, Settings as SettingsIcon, Sliders, Info, X } from "lucide-react"
import { Bug, FolderKanban, Users, LogOut, UserCircle, FolderOpen, LayoutDashboard, PlayCircle, ClipboardList, ChevronLeft, Server, ListChecks, Shield, ChevronUp, Tag, Search, Settings as SettingsIcon, Info, X } from "lucide-react"
import { useTranslation } from "react-i18next"
import { useLogout } from "../../hooks/useAuth"
import { useProject } from "../../hooks/useProjects"
Expand Down Expand Up @@ -29,7 +29,6 @@ const PROJECT_CONFIG_NAV = [
{ to: (id) => `/projects/${id}/members`, icon: Shield, labelKey: "project.members" },
{ to: (id) => `/projects/${id}/versions`, icon: Tag, labelKey: "project.versions" },
{ to: (id) => `/projects/${id}/environments`, icon: Server, labelKey: "project.environments" },
{ to: (id) => `/projects/${id}/custom-fields`, icon: Sliders, labelKey: "project.customFields" },
]

const PROJECT_SETTINGS_NAV = {
Expand Down
16 changes: 16 additions & 0 deletions frontend/src/components/projectSettings/CustomFieldsTab.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { useTranslation } from "react-i18next"

import { CustomFieldsPanel } from "../customField/CustomFieldsPanel"

export function CustomFieldsTab({ projectId }) {
const { t } = useTranslation("projectSettings")
return (
<div className="space-y-4">
<header>
<h2 className="text-lg font-semibold text-gray-900 dark:text-gray-100">{t("customFields.title")}</h2>
<p className="text-sm text-gray-500 dark:text-gray-400">{t("customFields.description")}</p>
</header>
<CustomFieldsPanel projectId={projectId} />
</div>
)
}
7 changes: 6 additions & 1 deletion frontend/src/i18n/locales/ca/projectSettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"general": "General",
"integrations": "Integracions",
"webhooks": "Webhooks",
"danger": "Zona de perill"
"danger": "Zona de perill",
"customFields": "Custom Fields"
},
"general": {
"title": "General",
Expand Down Expand Up @@ -71,5 +72,9 @@
},
"common": {
"cancel": "Cancel·la"
},
"customFields": {
"title": "Custom Fields",
"description": "Define custom fields for bugs, test cases, and executions."
}
}
7 changes: 6 additions & 1 deletion frontend/src/i18n/locales/en/projectSettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"general": "General",
"integrations": "Integrations",
"webhooks": "Webhooks",
"danger": "Danger zone"
"danger": "Danger zone",
"customFields": "Custom Fields"
},
"general": {
"title": "General",
Expand Down Expand Up @@ -71,5 +72,9 @@
},
"common": {
"cancel": "Cancel"
},
"customFields": {
"title": "Custom Fields",
"description": "Define custom fields for bugs, test cases, and executions."
}
}
7 changes: 6 additions & 1 deletion frontend/src/i18n/locales/es/projectSettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"general": "General",
"integrations": "Integraciones",
"webhooks": "Webhooks",
"danger": "Zona de peligro"
"danger": "Zona de peligro",
"customFields": "Campos personalizados"
},
"general": {
"title": "General",
Expand Down Expand Up @@ -71,5 +72,9 @@
},
"common": {
"cancel": "Cancelar"
},
"customFields": {
"title": "Campos personalizados",
"description": "Define campos personalizados para bugs, casos de prueba y ejecuciones."
}
}
7 changes: 6 additions & 1 deletion frontend/src/i18n/locales/eu/projectSettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"general": "Orokorra",
"integrations": "Integrazioak",
"webhooks": "Webhook-ak",
"danger": "Arrisku-eremua"
"danger": "Arrisku-eremua",
"customFields": "Custom Fields"
},
"general": {
"title": "Orokorra",
Expand Down Expand Up @@ -71,5 +72,9 @@
},
"common": {
"cancel": "Utzi"
},
"customFields": {
"title": "Custom Fields",
"description": "Define custom fields for bugs, test cases, and executions."
}
}
7 changes: 6 additions & 1 deletion frontend/src/i18n/locales/gl/projectSettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"general": "Xeral",
"integrations": "Integracións",
"webhooks": "Webhooks",
"danger": "Zona de perigo"
"danger": "Zona de perigo",
"customFields": "Custom Fields"
},
"general": {
"title": "Xeral",
Expand Down Expand Up @@ -71,5 +72,9 @@
},
"common": {
"cancel": "Cancelar"
},
"customFields": {
"title": "Custom Fields",
"description": "Define custom fields for bugs, test cases, and executions."
}
}
13 changes: 8 additions & 5 deletions frontend/src/pages/ProjectSettingsPage.jsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
import { useTranslation } from "react-i18next"
import { Navigate, NavLink, Route, Routes, useParams } from "react-router-dom"
import { AlertTriangle, FileText, Plug, Webhook } from "lucide-react"
import { AlertTriangle, FileText, Plug, Sliders, Webhook } from "lucide-react"

import { useProject } from "../hooks/useProjects"
import { PageBody, PageHeader } from "../components/ui/page-header"
import { GeneralTab } from "../components/projectSettings/GeneralTab"
import { IntegrationsTab } from "../components/projectSettings/IntegrationsTab"
import { WebhooksTab } from "../components/projectSettings/WebhooksTab"
import { CustomFieldsTab } from "../components/projectSettings/CustomFieldsTab"
import { DangerZoneTab } from "../components/projectSettings/DangerZoneTab"

const TABS = [
{ value: "general", icon: FileText, labelKey: "tabs.general" },
{ value: "integrations", icon: Plug, labelKey: "tabs.integrations" },
{ value: "webhooks", icon: Webhook, labelKey: "tabs.webhooks" },
{ value: "danger", icon: AlertTriangle, labelKey: "tabs.danger" },
{ value: "general", icon: FileText, labelKey: "tabs.general" },
{ value: "custom-fields", icon: Sliders, labelKey: "tabs.customFields" },
{ value: "integrations", icon: Plug, labelKey: "tabs.integrations" },
{ value: "webhooks", icon: Webhook, labelKey: "tabs.webhooks" },
{ value: "danger", icon: AlertTriangle, labelKey: "tabs.danger" },
]

export function ProjectSettingsPage() {
Expand Down Expand Up @@ -63,6 +65,7 @@ export function ProjectSettingsPage() {
<Routes>
<Route index element={<Navigate to="general" replace />} />
<Route path="general" element={<GeneralTab projectId={projectId} project={project} />} />
<Route path="custom-fields" element={<CustomFieldsTab projectId={projectId} />} />
<Route path="integrations" element={<IntegrationsTab projectId={projectId} />} />
<Route path="webhooks" element={<WebhooksTab projectId={projectId} />} />
<Route path="danger" element={<DangerZoneTab projectId={projectId} project={project} />} />
Expand Down
Loading