jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

search: fix domain search to include redirect/alias/secondary domains

Browse Source
This commit is contained in:
Girish Ramakrishnan
2025-11-10 13:16:40 +01:00
parent edb92ed0a5
commit 64cefd52c8
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dashboard/src/views/AppsView.vue
View File

@@ -134,15 +134,29 @@ function onActionMenu(app, event) {
const filteredApps = computed(() => { const filteredApps = computed(() => {
return apps.value.filter(a => { return apps.value.filter(a => {
return a.fqdn.includes(filter.value) || a.id.includes(filter.value) || a.manifest.title.toLocaleLowerCase().includes(filter.value.toLocaleLowerCase()); if (a.type === APP_TYPES.LINK) {
return a.upstreamUri.includes(filter.value);
} else { // app or proxy
return a.fqdn.includes(filter.value)
|| a.secondaryDomains.some(sd => sd.fqdn.includes(filter.value))
|| a.redirectDomains.some(rd => rd.fqdn.includes(filter.value))
|| a.aliasDomains.some(ad => ad.fqdn.includes(filter.value))
|| a.id.includes(filter.value)
|| a.manifest.title.toLocaleLowerCase().includes(filter.value.toLocaleLowerCase());
}
}).filter(a => { }).filter(a => {
if (!domainFilter.value) return true; if (!domainFilter.value) return true;
return a.domain === domainFilter.value; if (a.type === APP_TYPES.LINK) return false;
return a.domain === domainFilter.value
|| a.secondaryDomains.some(sd => sd.domain === domainFilter.value)
|| a.redirectDomains.some(rd => rd.domain === domainFilter.value)
|| a.aliasDomains.some(ad => ad.domain === domainFilter.value);
}).filter(a => { }).filter(a => {
if (!tagFilter.value) return true; if (!tagFilter.value) return true;
return a.tags.indexOf(tagFilter.value) !== -1; return a.tags.indexOf(tagFilter.value) !== -1;
}).filter(a => { }).filter(a => {
if (!stateFilter.value) return true; if (!stateFilter.value) return true;
if (a.type === APP_TYPES.LINK) return false;
if (stateFilter.value === 'running') return a.runState === RSTATES.RUNNING && a.health === HSTATES.HEALTHY && a.installationState === ISTATES.INSTALLED; if (stateFilter.value === 'running') return a.runState === RSTATES.RUNNING && a.health === HSTATES.HEALTHY && a.installationState === ISTATES.INSTALLED;
if (stateFilter.value === 'stopped') return a.runState === RSTATES.STOPPED; if (stateFilter.value === 'stopped') return a.runState === RSTATES.STOPPED;