Skip to content

fix(aws): correctly reformat dropdown text on forced update #534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stackunderfl0w wants to merge 1 commit into
base: main
Choose a base branch
from
+38 −24
Open

fix(aws): correctly reformat dropdown text on forced update #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 36 additions & 24 deletions docs/_static/js/formatted-dropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,32 +33,44 @@ document.addEventListener("DOMContentLoaded", () => {
}

function updateDropdowns() {
selects.forEach(sel => {
const key = sel.dataset.key;
const field = widget.querySelector(`.dropdown-field[data-field="${key}"]`);

const prevValue = sel.value;
const available = computeAvailableValues(key);

sel.innerHTML = available
.map(o => `<option value="${o.value}">${o.value}</option>`)
.join("");

// Try to restore previous value
if (available.some(a => a.value === prevValue)) {
sel.value = prevValue;
} else {
// Otherwise pick first valid value
sel.value = available[0]?.value;
}
for (let pass = 0; pass < selects.length; pass++) {
let changed = false;

selects.forEach(sel => {
const key = sel.dataset.key;
const field = widget.querySelector(`.dropdown-field[data-field="${key}"]`);

const prevValue = sel.value;
const available = computeAvailableValues(key);

sel.innerHTML = available
.map(o => `<option value="${o.value}">${o.value}</option>`)
.join("");
Comment thread
stackunderfl0w marked this conversation as resolved.

// Try to restore previous value
if (available.some(a => a.value === prevValue)) {
sel.value = prevValue;
} else {
// Otherwise pick first valid value
sel.value = available[0]?.value;
}

if (sel.value !== prevValue) {
changed = true;
}

// Hide the field if only one possible value
if (available.length === 1) {
field.style.display = "none";
} else {
field.style.display = "flex";
// Hide the field if only one possible value
if (available.length === 1) {
field.style.display = "none";
} else {
field.style.display = "flex";
}
});

if (!changed) {
break;
}
});
}
}

function updateOutput() {
Expand Down
2 changes: 2 additions & 0 deletions docs/exts/formatted-dropdown.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ def parse_value(self, raw: str):
return {"value": raw.strip(), "conditions": {}}

value = m.group("val").strip()
if value == '""':
value = ""
conds = m.group("conds")
if not conds:
return {"value": value, "conditions": {}}
Expand Down
Loading