Compare commits

..

No commits in common. "3425e3cafd2cff1e745cffe862428085a9bfe578" and "1a358a96ef30d550b5568884d188bb68a4252e44" have entirely different histories.

4 changed files with 49 additions and 92 deletions

View File

@ -2,7 +2,7 @@
"manifest_version": 2, "manifest_version": 2,
"name": "DocuWare Ablage", "name": "DocuWare Ablage",
"description": "Legt markierte E-Mails (als .eml, PDF und mit Anhängen) in DocuWare ab.", "description": "Legt markierte E-Mails (als .eml, PDF und mit Anhängen) in DocuWare ab.",
"version": "0.10.6", "version": "0.10.5",
"author": "l.lingler", "author": "l.lingler",
"applications": { "applications": {
"gecko": { "gecko": {

View File

@ -97,20 +97,12 @@
/* Mapping-Tabelle */ /* Mapping-Tabelle */
.map-toolbar { display: flex; align-items: center; gap: 10px; flex-wrap: wrap; margin: 4px 0 12px; } .map-toolbar { display: flex; align-items: center; gap: 10px; flex-wrap: wrap; margin: 4px 0 12px; }
.map-toolbar .grow { flex: 1; min-width: 180px; } .map-toolbar .grow { flex: 1; min-width: 180px; }
/* Mapping-Zeilen: Feldname + Attribut links gestapelt, fester Wert breit daneben. */ table.map { width: 100%; border-collapse: separate; border-spacing: 0 6px; }
.map { margin-top: 4px; } table.map th { text-align: left; font-size: 11px; letter-spacing: .4px; text-transform: uppercase;
.map-row { color: var(--muted); font-weight: 600; padding: 0 6px 2px; }
display: flex; align-items: center; gap: 10px; table.map td { padding: 0 6px; vertical-align: middle; }
background: var(--surface-2); border: 1px solid var(--border); table.map input, table.map select { padding: 7px 9px; }
border-radius: 9px; padding: 8px 8px 8px 10px; margin-bottom: 8px; table.map td.del { width: 40px; }
}
.map-left { display: flex; flex-direction: column; gap: 6px; flex: 1 1 auto; min-width: 0; }
.map-row.has-const .map-left { flex: 0 0 250px; }
.map-right { display: none; flex: 1 1 auto; min-width: 0; }
.map-row.has-const .map-right { display: flex; align-items: center; }
.map-left select, .map-right input { width: 100%; padding: 7px 9px; }
.map-hint { font-size: 11px; letter-spacing: .4px; text-transform: uppercase;
color: var(--muted); font-weight: 600; margin: 2px 2px 8px; }
.icon-btn { .icon-btn {
width: 30px; height: 30px; padding: 0; border-radius: 7px; cursor: pointer; width: 30px; height: 30px; padding: 0; border-radius: 7px; cursor: pointer;
background: var(--surface-2); border: 1px solid var(--border-strong); color: var(--muted); background: var(--surface-2); border: 1px solid var(--border-strong); color: var(--muted);
@ -220,8 +212,11 @@
<span id="mapFieldStatus" class="hint" style="margin:0"></span> <span id="mapFieldStatus" class="hint" style="margin:0"></span>
</div> </div>
<div class="map-hint">DocuWare-Feld&nbsp;→ Mail-Attribut · fester Wert</div> <table class="map">
<div id="mapBody" class="map"></div> <thead><tr><th>DocuWare-Feldname</th><th>Mail-Attribut</th><th></th></tr></thead>
<tbody id="mapBody"></tbody>
</table>
<datalist id="fieldNames"></datalist>
<div class="map-toolbar" style="margin-top:10px"> <div class="map-toolbar" style="margin-top:10px">
<button id="mapAdd" class="ghost" type="button">+ Zeile</button> <button id="mapAdd" class="ghost" type="button">+ Zeile</button>

View File

@ -22,22 +22,6 @@ async function load() {
// Schrankliste, falls vorher schon getestet (im Storage gecached) // Schrankliste, falls vorher schon getestet (im Storage gecached)
const cached = (await browser.storage.local.get("cabinets")).cabinets || []; const cached = (await browser.storage.local.get("cabinets")).cabinets || [];
fillCabinets(cached, s.defaultCabinetId); fillCabinets(cached, s.defaultCabinetId);
// Best-effort: Felder des Standard-Archivs gleich laden nur wenn schon ein
// Sitzungs-Token da ist (sonst wählt der Nutzer das Archiv manuell).
if (s.defaultCabinetId && [...$("mapCabinet").options].some((o) => o.value === s.defaultCabinetId)) {
$("mapCabinet").value = s.defaultCabinetId;
try {
const stt = await browser.runtime.sendMessage({ type: "auth:status" });
if (stt && stt.hasToken && stt.token) {
Auth.setToken(stt.token);
availableFields = (await DocuWare.cabinetFieldNames(s, s.defaultCabinetId))
.filter((n) => n && !/^DW[A-Z]/.test(n)).sort();
refreshFieldSelects();
$("mapFieldStatus").textContent = `${availableFields.length} Felder zur Auswahl geladen.`;
}
} catch (_) { /* egal Archiv kann manuell gewählt werden */ }
}
} }
function setMailFormat(v) { function setMailFormat(v) {
@ -99,7 +83,6 @@ async function ensureToken() {
// --- Feld-Mapping-Editor --------------------------------------------------- // --- Feld-Mapping-Editor ---------------------------------------------------
const CONST_OPT = "__const__"; // Sentinel im Quelle-Dropdown für „Fester Wert" const CONST_OPT = "__const__"; // Sentinel im Quelle-Dropdown für „Fester Wert"
let availableFields = []; // Feldnamen aus dem zuletzt gewählten Archiv
// Zerlegt einen Mapping-Wert (Token-String ODER { const } / { token }) in den UI-Zustand. // Zerlegt einen Mapping-Wert (Token-String ODER { const } / { token }) in den UI-Zustand.
function mapValueState(value) { function mapValueState(value) {
@ -111,71 +94,49 @@ function mapValueState(value) {
return { sel: "", konst: "" }; return { sel: "", konst: "" };
} }
// Befüllt ein Feldname-Dropdown mit den Archiv-Feldern + dem aktuellen Wert (bleibt erhalten).
function fillFieldSelect(sel, current) {
sel.innerHTML = "";
const empty = document.createElement("option");
empty.value = ""; empty.textContent = "— Feld wählen —";
sel.appendChild(empty);
[...new Set([...(availableFields || []), current].filter(Boolean))].sort().forEach((n) => {
const o = document.createElement("option");
o.value = n; o.textContent = n;
sel.appendChild(o);
});
sel.value = current || "";
}
// Aktualisiert alle Feldname-Dropdowns auf die aktuelle Archiv-Feldliste (Auswahl bleibt).
function refreshFieldSelects() {
document.querySelectorAll("#mapBody .map-field").forEach((sel) => fillFieldSelect(sel, sel.value));
}
function addMapRow(field = "", value = "") { function addMapRow(field = "", value = "") {
const st = mapValueState(value); const st = mapValueState(value);
const row = document.createElement("div"); const tr = document.createElement("tr");
row.className = "map-row" + (st.sel === CONST_OPT ? " has-const" : "");
// Links gestapelt: Feldname (Dropdown) über Mail-Attribut. const inp = document.createElement("input");
const left = document.createElement("div"); left.className = "map-left"; inp.type = "text"; inp.className = "map-field"; inp.value = field;
inp.placeholder = "EML_SUBJECT";
inp.setAttribute("list", "fieldNames"); // Vorschläge aus gewähltem Archiv
const tdF = document.createElement("td"); tdF.appendChild(inp);
const fieldSel = document.createElement("select"); fieldSel.className = "map-field"; const sel = document.createElement("select"); sel.className = "map-source";
fillFieldSelect(fieldSel, field);
const src = document.createElement("select"); src.className = "map-source";
const none = document.createElement("option"); none.value = ""; none.textContent = "— nichts —"; const none = document.createElement("option"); none.value = ""; none.textContent = "— nichts —";
src.appendChild(none); sel.appendChild(none);
MAIL_TOKENS.forEach((t) => { MAIL_TOKENS.forEach((t) => {
const o = document.createElement("option"); const o = document.createElement("option");
o.value = t.key; o.textContent = t.label; o.value = t.key; o.textContent = t.label;
if (t.key === st.sel) o.selected = true; if (t.key === st.sel) o.selected = true;
src.appendChild(o); sel.appendChild(o);
}); });
const co = document.createElement("option"); const co = document.createElement("option");
co.value = CONST_OPT; co.textContent = "★ Fester Wert"; co.value = CONST_OPT; co.textContent = "★ Fester Wert";
if (st.sel === CONST_OPT) co.selected = true; if (st.sel === CONST_OPT) co.selected = true;
src.appendChild(co); sel.appendChild(co);
left.append(fieldSel, src);
// Rechts (breit): fester Wert nur sichtbar bei „Fester Wert".
const right = document.createElement("div"); right.className = "map-right";
const konst = document.createElement("input"); const konst = document.createElement("input");
konst.type = "text"; konst.className = "map-const"; konst.placeholder = "Fester Wert, z. B. NEU"; konst.type = "text"; konst.className = "map-const"; konst.placeholder = "z. B. NEU";
konst.value = st.konst; konst.value = st.konst; konst.style.marginTop = "6px";
right.appendChild(konst); konst.style.display = st.sel === CONST_OPT ? "" : "none";
src.addEventListener("change", () => { sel.addEventListener("change", () => {
const isConst = src.value === CONST_OPT; konst.style.display = sel.value === CONST_OPT ? "" : "none";
row.classList.toggle("has-const", isConst); if (sel.value === CONST_OPT) konst.focus();
if (isConst) konst.focus();
}); });
const tdT = document.createElement("td"); tdT.appendChild(sel); tdT.appendChild(konst);
const del = document.createElement("button"); const del = document.createElement("button");
del.type = "button"; del.className = "icon-btn"; del.textContent = "✕"; del.title = "Zeile entfernen"; del.type = "button"; del.className = "icon-btn"; del.textContent = "✕"; del.title = "Zeile entfernen";
del.addEventListener("click", () => row.remove()); del.addEventListener("click", () => tr.remove());
const tdX = document.createElement("td"); tdX.className = "del"; tdX.appendChild(del);
row.append(left, right, del); tr.append(tdF, tdT, tdX);
$("mapBody").appendChild(row); $("mapBody").appendChild(tr);
} }
function loadMapping(map) { function loadMapping(map) {
@ -185,12 +146,12 @@ function loadMapping(map) {
function collectMapping() { function collectMapping() {
const map = {}; const map = {};
document.querySelectorAll("#mapBody .map-row").forEach((row) => { document.querySelectorAll("#mapBody tr").forEach((tr) => {
const f = row.querySelector(".map-field").value.trim(); const f = tr.querySelector(".map-field").value.trim();
if (!f) return; // ohne Feldname ignorieren if (!f) return; // ohne Feldname ignorieren
const sel = row.querySelector(".map-source").value; const sel = tr.querySelector(".map-source").value;
if (sel === CONST_OPT) { if (sel === CONST_OPT) {
const c = row.querySelector(".map-const").value; const c = tr.querySelector(".map-const").value;
if (c !== "") map[f] = { const: c }; // fester Wert if (c !== "") map[f] = { const: c }; // fester Wert
} else if (sel) { } else if (sel) {
map[f] = sel; // Mail-Token (als String, abwärtskompatibel) map[f] = sel; // Mail-Token (als String, abwärtskompatibel)
@ -287,18 +248,23 @@ $("mappingPull").addEventListener("click", async () => {
// Archiv wählen -> dessen Indexfelder als Vorschläge (datalist) für alle Feldnamen. // Archiv wählen -> dessen Indexfelder als Vorschläge (datalist) für alle Feldnamen.
$("mapCabinet").addEventListener("change", async () => { $("mapCabinet").addEventListener("change", async () => {
const id = $("mapCabinet").value; const id = $("mapCabinet").value;
const dl = $("fieldNames");
const st = $("mapFieldStatus"); const st = $("mapFieldStatus");
if (!id) { availableFields = []; refreshFieldSelects(); st.textContent = ""; return; } if (!id) { dl.innerHTML = ""; st.textContent = ""; return; }
st.textContent = "Lade Felder …"; st.textContent = "Lade Felder …";
try { try {
const s = await Settings.get(); const s = await Settings.get();
const ok = await ensureToken(); const ok = await ensureToken();
if (!ok) { st.textContent = "Erst „Verbindung testen“ (Passwort nötig)."; return; } if (!ok) { st.textContent = "Erst „Verbindung testen“ (Passwort nötig)."; return; }
availableFields = (await DocuWare.cabinetFieldNames(s, id)) const names = (await DocuWare.cabinetFieldNames(s, id))
.filter((n) => n && !/^DW[A-Z]/.test(n)) // DW*-Systemfelder ausblenden .filter((n) => n && !/^DW[A-Z]/.test(n)); // DW*-Systemfelder ausblenden
.sort(); dl.innerHTML = "";
refreshFieldSelects(); names.sort().forEach((n) => {
st.textContent = `${availableFields.length} Felder zur Auswahl geladen.`; const o = document.createElement("option");
o.value = n;
dl.appendChild(o);
});
st.textContent = `${names.length} Felder als Vorschlag geladen.`;
} catch (e) { } catch (e) {
st.textContent = `Fehler: ${e.message}`; st.textContent = `Fehler: ${e.message}`;
} }

View File

@ -25,10 +25,6 @@
{ {
"version": "0.10.5", "version": "0.10.5",
"update_link": "https://sylyx.xyz/sylyx/thunderbird2docuware/releases/download/v0.10.5/docuware-ablage-0.10.5.xpi" "update_link": "https://sylyx.xyz/sylyx/thunderbird2docuware/releases/download/v0.10.5/docuware-ablage-0.10.5.xpi"
},
{
"version": "0.10.6",
"update_link": "https://sylyx.xyz/sylyx/thunderbird2docuware/releases/download/v0.10.6/docuware-ablage-0.10.6.xpi"
} }
] ]
} }