marcel/zoraxy
1
0
Fork 0
mirror of https://github.com/tobychui/zoraxy.git synced 2025-06-03 06:07:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #280 from 7brend7/fix-added-containers-list

Browse Source 
Fix existings containers list in docker popup
This commit is contained in:
Toby Chui 2024-08-07 13:40:24 +08:00 committed by GitHub
commit ddbecf7b68
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/web/snippet/dockerContainersList.html
View File

@ -34,7 +34,7 @@
<script>
const lines = {};
const linesAded = [];
const linesAded = {};
function getDockerContainers() {
const hostRequest = $.get("/api/proxy/list?type=host");
@ -54,7 +54,9 @@
Config: [{ Gateway: gateway }],
},
} = bridge;
const existedDomains = hostData.map(({ Domain }) => Domain);
const existedDomains = hostData.reduce((acc, { ActiveOrigins }) => {
return acc.concat(ActiveOrigins.map(({ OriginIpOrDomain }) => OriginIpOrDomain));
}, []);
for (const container of containers) {
const {
@ -63,19 +65,20 @@
} = container;
for (const portObject of Ports.filter(
({ IP: ip }) => ip === "::"
({ IP: ip }) => ip === "::" || ip === '0.0.0.0'
)) {
const { IP: ip, PublicPort: port } = portObject;
const key = `${name}-${port}`;
if (
existedDomains.some((item) => item === `${gateway}:${port}`)
existedDomains.some((item) => item === `${gateway}:${port}`) &&
!linesAded[key]
) {
linesAded.push({
linesAded[key] = {
name: name.replace(/^\//, ""),
ip: gateway,
port,
});
};
} else if (!lines[key]) {
lines[key] = {
name: name.replace(/^\//, ""),
@ -100,7 +103,7 @@
</div>`
);
}
for (const line of linesAded) {
for (const [key, line] of Object.entries(linesAded)) {
$("#containersAddedList").append(
`<div class="item">
<div class="content">
@ -111,7 +114,7 @@
</div>`
);
}
linesAded.length &&
Object.entries(linesAded).length &&
$("#containersAddedListHeader").removeAttr("hidden");
$("#containersList .loader").removeClass("active");
} else {