fix: resolve all merge conflict markers from feat/zeroclaw-compliance-agent
Build + Deploy / build-admin-compliance (push) Successful in 2m7s
Build + Deploy / build-backend-compliance (push) Failing after 5m21s
Build + Deploy / build-ai-sdk (push) Successful in 53s
Build + Deploy / build-developer-portal (push) Successful in 1m18s
Build + Deploy / build-tts (push) Successful in 1m42s
Build + Deploy / build-document-crawler (push) Successful in 45s
Build + Deploy / build-dsms-gateway (push) Successful in 27s
Build + Deploy / build-dsms-node (push) Successful in 19s
CI / branch-name (push) Has been skipped
Build + Deploy / trigger-orca (push) Has been skipped
CI / guardrail-integrity (push) Has been skipped
CI / loc-budget (push) Failing after 19s
CI / secret-scan (push) Has been skipped
CI / go-lint (push) Has been skipped
CI / python-lint (push) Has been skipped
CI / nodejs-lint (push) Has been skipped
CI / nodejs-build (push) Successful in 3m6s
CI / dep-audit (push) Has been skipped
CI / sbom-scan (push) Has been skipped
CI / test-go (push) Successful in 55s
CI / test-python-backend (push) Successful in 44s
CI / test-python-document-crawler (push) Successful in 30s
CI / test-python-dsms-gateway (push) Successful in 26s
CI / validate-canonical-controls (push) Successful in 18s

9 files had conflict markers from the branch merge. All resolved keeping
the feature branch version. Also split agent_scan_routes.py (534→367 LOC)
by extracting Pydantic models to agent_scan_models.py.

[guardrail-change]

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Benjamin Admin
2026-05-11 12:15:07 +02:00
parent e03a86a9bb
commit 02ff96f74e
13 changed files with 123 additions and 777 deletions
-64
View File
@@ -54,18 +54,6 @@ export default function CMPDashboardPage() {
const [consentStats, setConsentStats] = useState<ConsentStats | null>(null)
const [dsrStats, setDSRStats] = useState<DSRStats | null>(null)
const [sites, setSites] = useState<any[]>([])
<<<<<<< HEAD
const [selectedSite, setSelectedSite] = useState<string>('')
const [loading, setLoading] = useState(true)
const fb = (path: string) => fetch(`${BANNER_API}/${path}`, { headers: HEADERS }).then(r => r.ok ? r.json() : null).catch(() => null)
// Load sites + consent/dsr stats on mount
useEffect(() => {
async function load() {
const fa = (path: string) => fetch(`/api/sdk/v1/compliance/${path}`, { headers: HEADERS }).then(r => r.ok ? r.json() : null).catch(() => null)
const [consent, dsr, siteList] = await Promise.all([
=======
const [loading, setLoading] = useState(true)
useEffect(() => {
@@ -74,34 +62,10 @@ export default function CMPDashboardPage() {
const fa = (path: string) => fetch(`/api/sdk/v1/compliance/${path}`, { headers: HEADERS }).then(r => r.ok ? r.json() : null).catch(() => null)
const [banner, consent, dsr, siteList] = await Promise.all([
fb('admin/stats/preview-test-site'),
>>>>>>> feat/zeroclaw-compliance-agent
fa('einwilligungen/consents/stats'),
fa('dsr/stats'),
fb('admin/sites'),
])
<<<<<<< HEAD
setConsentStats(consent)
setDSRStats(dsr)
const loadedSites = Array.isArray(siteList) ? siteList : []
setSites(loadedSites)
// Auto-select first site
if (loadedSites.length > 0) {
setSelectedSite(loadedSites[0].site_id || loadedSites[0].siteId || '')
}
setLoading(false)
}
load()
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [])
// Load banner stats when selected site changes
useEffect(() => {
if (!selectedSite) return
fb(`admin/stats/${selectedSite}`).then(setBannerStats)
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [selectedSite])
=======
setBannerStats(banner)
setConsentStats(consent)
setDSRStats(dsr)
@@ -111,7 +75,6 @@ export default function CMPDashboardPage() {
load()
}, [])
>>>>>>> feat/zeroclaw-compliance-agent
const totalConsents = (bannerStats?.total_consents || 0) + (consentStats?.total_consents || 0)
const dsrOpen = dsrStats ? (dsrStats.by_status?.intake || 0) + (dsrStats.by_status?.processing || 0) + (dsrStats.by_status?.identity_verification || 0) : 0
const dsrOverdue = dsrStats?.overdue || 0
@@ -123,36 +86,12 @@ export default function CMPDashboardPage() {
<div className="flex items-center justify-between">
<div>
<h1 className="text-2xl font-bold text-gray-900">Consent Management Platform</h1>
<<<<<<< HEAD
<p className="text-gray-500 mt-1">Überblick über Einwilligungen, Betroffenenrechte und Vendor-Compliance</p>
</div>
<div className="flex items-center gap-3">
{sites.length > 0 && (
<select
value={selectedSite}
onChange={e => setSelectedSite(e.target.value)}
className="px-3 py-2 border border-gray-300 rounded-lg text-sm bg-white focus:ring-2 focus:ring-purple-500 focus:border-purple-500"
>
{sites.map((s: any) => (
<option key={s.site_id || s.siteId} value={s.site_id || s.siteId}>
{s.site_name || s.siteName || s.site_id || s.siteId}
</option>
))}
</select>
)}
<Link href="/sdk/cookie-banner/preview"
className="px-4 py-2 bg-purple-600 text-white rounded-lg text-sm font-medium hover:bg-purple-700 transition-colors">
Banner testen
</Link>
</div>
=======
<p className="text-gray-500 mt-1">Ueberblick ueber Einwilligungen, Betroffenenrechte und Vendor-Compliance</p>
</div>
<Link href="/sdk/cookie-banner/preview"
className="px-4 py-2 bg-purple-600 text-white rounded-lg text-sm font-medium hover:bg-purple-700 transition-colors">
Banner testen
</Link>
>>>>>>> feat/zeroclaw-compliance-agent
</div>
{/* KPI Cards */}
@@ -235,8 +174,6 @@ export default function CMPDashboardPage() {
</div>
</div>
<<<<<<< HEAD
=======
{/* Banner-Bedarf Hinweis (TTDSG § 25) */}
{bannerStats && Object.keys(bannerStats.category_acceptance).length === 0 && sites.length === 0 && (
<div className="bg-green-50 border border-green-200 rounded-xl p-5 flex items-start gap-4">
@@ -275,7 +212,6 @@ export default function CMPDashboardPage() {
</div>
)}
>>>>>>> feat/zeroclaw-compliance-agent
{/* Compliance Status */}
<div className="bg-white rounded-xl border border-gray-200 p-6">
<h3 className="font-semibold text-gray-900 mb-1">Compliance-Status</h3>