rowan/multi-account-containers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Wildcard subdomains - UI improvements

Browse source
This commit is contained in:
Francis McKenzie 2022-05-16 12:53:32 +02:00
parent 8f5a7e6d39
commit 83fd73b342
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/css/popup.css
View file

@ -1817,7 +1817,11 @@ manage things like container crud */
} }
#edit-sites-assigned .hostname .subdomain.wildcardSubdomain { #edit-sites-assigned .hostname .subdomain.wildcardSubdomain {
opacity: 0.2; background-color: var(--identity-icon-color);
border-radius: 8px;
margin-right: 4px;
padding-left: 10px;
padding-right: 10px;
} }
.assigned-sites-list > div { .assigned-sites-list > div {

11
src/js/popup.js
View file

@ -1377,6 +1377,7 @@ Logic.registerPanel(P_CONTAINER_ASSIGNMENTS, {
// Populating the panel: name and icon // Populating the panel: name and icon
document.getElementById("edit-assignments-title").textContent = identity.name; document.getElementById("edit-assignments-title").textContent = identity.name;
document.getElementById("edit-sites-assigned").setAttribute("data-identity-color", identity.color);
const userContextId = Logic.currentUserContextId(); const userContextId = Logic.currentUserContextId();
const assignments = await Logic.getAssignmentObjectByContainer(userContextId); const assignments = await Logic.getAssignmentObjectByContainer(userContextId);
@ -1427,7 +1428,7 @@ Logic.registerPanel(P_CONTAINER_ASSIGNMENTS, {
}); });
// Wildcard click-to-toggle subdomains // Wildcard click-to-toggle subdomains
trElement.querySelectorAll(".subdomain").forEach((subdomainLink) => { trElement.querySelectorAll(".subdomain").forEach((subdomainLink) => {
subdomainLink.addEventListener("click", async (e) => { subdomainLink.addEventListener("click", (e) => {
const wildcardHostname = e.target.getAttribute("data-wildcardHostname"); const wildcardHostname = e.target.getAttribute("data-wildcardHostname");
Utils.setWildcardHostnameForAssignment(assumedUrl, wildcardHostname); Utils.setWildcardHostnameForAssignment(assumedUrl, wildcardHostname);
if (wildcardHostname) { if (wildcardHostname) {
@ -1454,14 +1455,14 @@ Logic.registerPanel(P_CONTAINER_ASSIGNMENTS, {
if (wildcardHostname && wildcardHostname !== hostname) { if (wildcardHostname && wildcardHostname !== hostname) {
if (hostname.endsWith(wildcardHostname)) { if (hostname.endsWith(wildcardHostname)) {
return { return {
wildcard: hostname.substring(0, hostname.length - wildcardHostname.length), wildcard: "★",
remaining: wildcardHostname remaining: wildcardHostname
}; };
} else { } else {
// In case something got corrupted, allow user to fix error // In case something got corrupted, allow user to fix error
// by clicking "____" link to clear corrupted wildcard hostname // by clicking '★' link to clear corrupted wildcard hostname
return { return {
wildcard: "___", wildcard: "★",
remaining: hostname remaining: hostname
}; };
} }
@ -1480,6 +1481,7 @@ Logic.registerPanel(P_CONTAINER_ASSIGNMENTS, {
// Add wildcard subdomain(s) // Add wildcard subdomain(s)
if (subdomains.wildcard) { if (subdomains.wildcard) {
result.appendChild(this.assignmentSubdomainLink(null, subdomains.wildcard)); result.appendChild(this.assignmentSubdomainLink(null, subdomains.wildcard));
result.appendChild(document.createTextNode("."));
} }
// Add non-wildcard subdomains // Add non-wildcard subdomains
@ -1503,6 +1505,7 @@ Logic.registerPanel(P_CONTAINER_ASSIGNMENTS, {
result.className = "subdomain"; result.className = "subdomain";
if (wildcardHostnameOnClick) { if (wildcardHostnameOnClick) {
result.setAttribute("data-wildcardHostname", wildcardHostnameOnClick); result.setAttribute("data-wildcardHostname", wildcardHostnameOnClick);
result.title = `*.${wildcardHostnameOnClick}`;
} else { } else {
result.classList.add("wildcardSubdomain"); result.classList.add("wildcardSubdomain");
} }