Enhance MediaWiki import functionality with category normalization and skill attributes
Deploy Development / deploy (push) Successful in 38s
Test Suite / pytest-backend (push) Successful in 40s
Test Suite / lint-backend (push) Successful in 0s
Test Suite / build-frontend (push) Successful in 12s
Test Suite / k6 /health Baseline (push) Successful in 33s
Test Suite / playwright-tests (push) Successful in 1m17s
Test Suite / pytest-backend (pull_request) Successful in 35s
Test Suite / lint-backend (pull_request) Successful in 0s
Test Suite / build-frontend (pull_request) Successful in 12s
Test Suite / k6 /health Baseline (pull_request) Successful in 33s
Test Suite / playwright-tests (pull_request) Successful in 1m8s
Deploy Development / deploy (push) Successful in 38s
Test Suite / pytest-backend (push) Successful in 40s
Test Suite / lint-backend (push) Successful in 0s
Test Suite / build-frontend (push) Successful in 12s
Test Suite / k6 /health Baseline (push) Successful in 33s
Test Suite / playwright-tests (push) Successful in 1m17s
Test Suite / pytest-backend (pull_request) Successful in 35s
Test Suite / lint-backend (pull_request) Successful in 0s
Test Suite / build-frontend (pull_request) Successful in 12s
Test Suite / k6 /health Baseline (pull_request) Successful in 33s
Test Suite / playwright-tests (pull_request) Successful in 1m8s
- Introduced `_normalize_mw_category` function to clean category names for API calls, ensuring consistent handling of category prefixes. - Updated `SmwClient` methods to utilize normalized category names, improving data retrieval accuracy. - Added `_wiki_category_or_default` function to provide default categories based on import type, enhancing user experience during imports. - Integrated new fields `karate_relevance` and `relevance_level` into various admin components, allowing for better skill management. - Incremented app version to 0.8.145 and updated changelog to reflect these changes.
This commit is contained in:
1 parent
949a77fe38
commit
623af621b4
11 files changed
+407
-34
No files matched your search
@@ -25,6 +25,13 @@ export default function MaturityModelsAdminPanel() {
|
||||
const [levelsForm, setLevelsForm] = useState([])
|
||||
const [cellDraft, setCellDraft] = useState({})
|
||||
const [skillToAdd, setSkillToAdd] = useState('')
|
||||
/** Modal: Stammdaten Fähigkeit (Wiki-Felder) aus Matrix-Kontext */
|
||||
const [skillWikiModal, setSkillWikiModal] = useState(null)
|
||||
const [skillWikiForm, setSkillWikiForm] = useState({
|
||||
karate_relevance: '',
|
||||
relevance_level: ''
|
||||
})
|
||||
const [skillWikiLoading, setSkillWikiLoading] = useState(false)
|
||||
|
||||
useEffect(() => {
|
||||
let cancelled = false
|
||||
@@ -219,6 +226,57 @@ export default function MaturityModelsAdminPanel() {
|
||||
}
|
||||
}
|
||||
|
||||
async function openSkillWikiModal(skillId, skillName) {
|
||||
setSkillWikiModal({ skill_id: skillId, skill_name: skillName })
|
||||
setSkillWikiLoading(true)
|
||||
setSkillWikiForm({ karate_relevance: '', relevance_level: '' })
|
||||
try {
|
||||
const s = await api.getSkill(skillId)
|
||||
setSkillWikiForm({
|
||||
karate_relevance: s.karate_relevance || '',
|
||||
relevance_level:
|
||||
s.relevance_level != null && s.relevance_level !== ''
|
||||
? String(s.relevance_level)
|
||||
: ''
|
||||
})
|
||||
} catch (e) {
|
||||
setError(e.message || String(e))
|
||||
setSkillWikiModal(null)
|
||||
} finally {
|
||||
setSkillWikiLoading(false)
|
||||
}
|
||||
}
|
||||
|
||||
function closeSkillWikiModal() {
|
||||
setSkillWikiModal(null)
|
||||
}
|
||||
|
||||
async function handleSaveSkillWikiFields(e) {
|
||||
e.preventDefault()
|
||||
if (!skillWikiModal) return
|
||||
setError('')
|
||||
setSkillWikiLoading(true)
|
||||
try {
|
||||
await api.updateSkill(skillWikiModal.skill_id, {
|
||||
karate_relevance:
|
||||
skillWikiForm.karate_relevance && skillWikiForm.karate_relevance.trim()
|
||||
? skillWikiForm.karate_relevance.trim()
|
||||
: null,
|
||||
relevance_level:
|
||||
skillWikiForm.relevance_level === '' || skillWikiForm.relevance_level == null
|
||||
? null
|
||||
: Number(skillWikiForm.relevance_level)
|
||||
})
|
||||
const sk = await api.listSkills({ status: 'active' })
|
||||
setAllSkills(sk)
|
||||
closeSkillWikiModal()
|
||||
} catch (e) {
|
||||
setError(e.message || String(e))
|
||||
} finally {
|
||||
setSkillWikiLoading(false)
|
||||
}
|
||||
}
|
||||
|
||||
async function handleDeleteModel() {
|
||||
if (!selectedId || !isSuperadmin) return
|
||||
if (!confirm('Reifegradmodell dauerhaft löschen?')) return
|
||||
@@ -552,13 +610,24 @@ export default function MaturityModelsAdminPanel() {
|
||||
<li key={ms.skill_id} className="admin-matrix-skill-list__item">
|
||||
<div className="admin-matrix-skill-list__row">
|
||||
<strong className="admin-matrix-skill-list__name">{ms.skill_name}</strong>
|
||||
<button
|
||||
type="button"
|
||||
className="btn btn-secondary btn-small"
|
||||
onClick={() => handleRemoveSkill(ms.skill_id)}
|
||||
>
|
||||
Entfernen
|
||||
</button>
|
||||
<span className="admin-matrix-skill-list__buttons">
|
||||
<button
|
||||
type="button"
|
||||
className="btn btn-secondary btn-small"
|
||||
disabled={saving || skillWikiLoading}
|
||||
title="Karate-Relevanz und Relevanzgrad bearbeiten"
|
||||
onClick={() => openSkillWikiModal(ms.skill_id, ms.skill_name)}
|
||||
>
|
||||
Wiki-Felder
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
className="btn btn-secondary btn-small"
|
||||
onClick={() => handleRemoveSkill(ms.skill_id)}
|
||||
>
|
||||
Entfernen
|
||||
</button>
|
||||
</span>
|
||||
</div>
|
||||
{(ms.skill_main_category_name || ms.skill_subcategory_name) ? (
|
||||
<div className="admin-matrix-skill-list__path muted">
|
||||
@@ -595,13 +664,26 @@ export default function MaturityModelsAdminPanel() {
|
||||
{(detail.model_skills || []).map((ms) => (
|
||||
<tr key={ms.skill_id}>
|
||||
<td className="admin-matrix-matrix__skill-cell">
|
||||
<div>{ms.skill_name}</div>
|
||||
{(ms.skill_main_category_name || ms.skill_subcategory_name) ? (
|
||||
<div className="admin-matrix-matrix__skill-path muted">
|
||||
{ms.skill_main_category_name || '—'}
|
||||
{ms.skill_subcategory_name ? ` › ${ms.skill_subcategory_name}` : ''}
|
||||
<div className="admin-matrix-matrix__skill-head">
|
||||
<div>
|
||||
<div>{ms.skill_name}</div>
|
||||
{(ms.skill_main_category_name || ms.skill_subcategory_name) ? (
|
||||
<div className="admin-matrix-matrix__skill-path muted">
|
||||
{ms.skill_main_category_name || '—'}
|
||||
{ms.skill_subcategory_name ? ` › ${ms.skill_subcategory_name}` : ''}
|
||||
</div>
|
||||
) : null}
|
||||
</div>
|
||||
) : null}
|
||||
<button
|
||||
type="button"
|
||||
className="btn btn-ghost btn-tiny"
|
||||
title="Karate-Relevanz und Relevanzgrad bearbeiten"
|
||||
disabled={saving || skillWikiLoading}
|
||||
onClick={() => openSkillWikiModal(ms.skill_id, ms.skill_name)}
|
||||
>
|
||||
✎
|
||||
</button>
|
||||
</div>
|
||||
</td>
|
||||
{(detail.levels || []).map((l) => {
|
||||
const key = `${ms.skill_id}-${l.level_number}`
|
||||
@@ -643,6 +725,90 @@ export default function MaturityModelsAdminPanel() {
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{skillWikiModal ? (
|
||||
<div
|
||||
className="admin-modal-backdrop"
|
||||
role="presentation"
|
||||
onClick={closeSkillWikiModal}
|
||||
>
|
||||
<div
|
||||
className="admin-modal-sheet"
|
||||
role="dialog"
|
||||
aria-modal="true"
|
||||
aria-labelledby="matrix-skill-wiki-title"
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
>
|
||||
<div className="admin-modal-sheet__header">
|
||||
<h3 id="matrix-skill-wiki-title" className="admin-modal-sheet__title">
|
||||
Fähigkeit: {skillWikiModal.skill_name}
|
||||
</h3>
|
||||
<button
|
||||
type="button"
|
||||
className="btn btn-secondary admin-modal-sheet__close"
|
||||
disabled={skillWikiLoading}
|
||||
onClick={closeSkillWikiModal}
|
||||
aria-label="Schließen"
|
||||
>
|
||||
✕
|
||||
</button>
|
||||
</div>
|
||||
<div className="admin-modal-sheet__body">
|
||||
{skillWikiLoading ? (
|
||||
<p className="muted">Lade Daten…</p>
|
||||
) : (
|
||||
<form className="skills-catalog-form" onSubmit={handleSaveSkillWikiFields}>
|
||||
<label className="form-label">Karate-Relevanz (Wiki)</label>
|
||||
<textarea
|
||||
className="form-input"
|
||||
rows={4}
|
||||
value={skillWikiForm.karate_relevance}
|
||||
onChange={(e) =>
|
||||
setSkillWikiForm((f) => ({ ...f, karate_relevance: e.target.value }))
|
||||
}
|
||||
disabled={skillWikiLoading}
|
||||
placeholder="Freitext (Wiki-Eigenschaft KarateRelevanz)"
|
||||
/>
|
||||
<label className="form-label">Relevanzgrad (Wiki, 1–3)</label>
|
||||
<select
|
||||
className="form-input"
|
||||
value={
|
||||
skillWikiForm.relevance_level === ''
|
||||
? ''
|
||||
: String(skillWikiForm.relevance_level)
|
||||
}
|
||||
onChange={(e) =>
|
||||
setSkillWikiForm((f) => ({ ...f, relevance_level: e.target.value }))
|
||||
}
|
||||
disabled={skillWikiLoading}
|
||||
>
|
||||
<option value="">– nicht gesetzt –</option>
|
||||
<option value="1">1</option>
|
||||
<option value="2">2</option>
|
||||
<option value="3">3</option>
|
||||
</select>
|
||||
<p className="muted admin-matrix-hint">
|
||||
Änderungen gelten für die Fähigkeit im gesamten Katalog (gemeinsame Stammdaten).
|
||||
</p>
|
||||
<div className="skills-catalog-form__actions">
|
||||
<button type="submit" className="btn btn-primary" disabled={skillWikiLoading}>
|
||||
Speichern
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
className="btn btn-secondary"
|
||||
disabled={skillWikiLoading}
|
||||
onClick={closeSkillWikiModal}
|
||||
>
|
||||
Abbrechen
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
) : null}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -71,7 +71,9 @@ export default function SkillsCatalogAdmin() {
|
||||
keywords: '',
|
||||
status: 'active',
|
||||
sort_order: '',
|
||||
category_id: ''
|
||||
category_id: '',
|
||||
karate_relevance: '',
|
||||
relevance_level: ''
|
||||
})
|
||||
|
||||
const [newMainName, setNewMainName] = useState('')
|
||||
@@ -176,7 +178,12 @@ export default function SkillsCatalogAdmin() {
|
||||
keywords: s.keywords || '',
|
||||
status: s.status || 'active',
|
||||
sort_order: s.sort_order ?? '',
|
||||
category_id: s.category_id ?? ''
|
||||
category_id: s.category_id ?? '',
|
||||
karate_relevance: s.karate_relevance || '',
|
||||
relevance_level:
|
||||
s.relevance_level != null && s.relevance_level !== ''
|
||||
? String(s.relevance_level)
|
||||
: ''
|
||||
})
|
||||
setEditDialog({ type: 'skill', id: s.id })
|
||||
}
|
||||
@@ -304,7 +311,15 @@ export default function SkillsCatalogAdmin() {
|
||||
skillForm.sort_order === '' || skillForm.sort_order == null
|
||||
? null
|
||||
: Number(skillForm.sort_order),
|
||||
category_id: cid
|
||||
category_id: cid,
|
||||
karate_relevance:
|
||||
typeof skillForm.karate_relevance === 'string' && skillForm.karate_relevance.trim()
|
||||
? skillForm.karate_relevance.trim()
|
||||
: null,
|
||||
relevance_level:
|
||||
skillForm.relevance_level === '' || skillForm.relevance_level == null
|
||||
? null
|
||||
: Number(skillForm.relevance_level)
|
||||
})
|
||||
})
|
||||
if (ok) {
|
||||
@@ -922,6 +937,31 @@ export default function SkillsCatalogAdmin() {
|
||||
onChange={(e) => setSkillForm((f) => ({ ...f, description: e.target.value }))}
|
||||
disabled={busy}
|
||||
/>
|
||||
<label className="form-label">Karate-Relevanz (Wiki)</label>
|
||||
<textarea
|
||||
className="form-input"
|
||||
rows={3}
|
||||
value={skillForm.karate_relevance}
|
||||
onChange={(e) =>
|
||||
setSkillForm((f) => ({ ...f, karate_relevance: e.target.value }))
|
||||
}
|
||||
disabled={busy}
|
||||
placeholder="Freitext aus Wiki / eigene Erläuterung"
|
||||
/>
|
||||
<label className="form-label">Relevanzgrad (Wiki, 1–3)</label>
|
||||
<select
|
||||
className="form-input"
|
||||
value={skillForm.relevance_level === '' ? '' : String(skillForm.relevance_level)}
|
||||
onChange={(e) =>
|
||||
setSkillForm((f) => ({ ...f, relevance_level: e.target.value }))
|
||||
}
|
||||
disabled={busy}
|
||||
>
|
||||
<option value="">– nicht gesetzt –</option>
|
||||
<option value="1">1</option>
|
||||
<option value="2">2</option>
|
||||
<option value="3">3</option>
|
||||
</select>
|
||||
<label className="form-label">Sortierung (optional)</label>
|
||||
<input
|
||||
className="form-input"
|
||||
|
||||
Reference in new issue
Block a user