eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Resolves inaccurate OR relationship between loaders and versions. (#86)

Browse Source 
* Resolves inaccurate OR relationship between loaders and versions.

* Removes todo comment.
This commit is contained in:
Zach Baird
2023-04-18 23:49:04 -04:00
committed by GitHub
parent 640db2d079
commit d414e07f41
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
theseus_gui/src/store/search.js
View File

@@ -36,28 +36,31 @@ export const useSearch = defineStore('searchStore', {
formattedAndFacets = formattedAndFacets.slice(0, formattedAndFacets.length - 1) formattedAndFacets = formattedAndFacets.slice(0, formattedAndFacets.length - 1)
formattedAndFacets += '' formattedAndFacets += ''
// TODO: fix me - ask jai
// If orFacets are present, start building formatted orFacet filter // If orFacets are present, start building formatted orFacet filter
let formattedOrFacets = '' let formattedOrFacets = ''
if (this.orFacets.length > 0 || this.activeVersions.length > 0) { if (this.orFacets.length > 0) {
formattedOrFacets += '[' formattedOrFacets += '['
// Aggregate normal orFacets
this.orFacets.forEach((orF) => (formattedOrFacets += `"${orF}",`)) this.orFacets.forEach((orF) => (formattedOrFacets += `"${orF}",`))
// Add version list to orFacets
if (this.activeVersions.length > 0)
this.activeVersions.forEach((ver) => (formattedOrFacets += `"versions:${ver}",`))
// Add environments to orFacets if enabled
if (this.environments.client)
formattedOrFacets += '"client_side:optional","client_side:required,"'
if (this.environments.server)
formattedOrFacets += '"server_side:optional","server_side:required,"'
formattedOrFacets = formattedOrFacets.slice(0, formattedOrFacets.length - 1) formattedOrFacets = formattedOrFacets.slice(0, formattedOrFacets.length - 1)
formattedOrFacets += ']' formattedOrFacets += '],'
} }
// Snip normal orFacets and start version orFacets
if (this.activeVersions.length > 0) {
formattedOrFacets += '['
this.activeVersions.forEach((ver) => (formattedOrFacets += `"versions:${ver}",`))
formattedOrFacets = formattedOrFacets.slice(0, formattedOrFacets.length - 1)
formattedOrFacets += '],'
}
// Add environments to orFacets if enabled
if (this.environments.client)
formattedOrFacets += '["client_side:optional","client_side:required"]]'
if (this.environments.server)
formattedOrFacets += '["server_side:optional","server_side:required"]]'
formattedOrFacets = formattedOrFacets.slice(0, formattedOrFacets.length - 1)
// Aggregate facet query string // Aggregate facet query string
const facets = `&facets=[${formattedAndFacets}${ const facets = `&facets=[${formattedAndFacets}${
formattedOrFacets.length > 0 ? `,${formattedOrFacets}` : '' formattedOrFacets.length > 0 ? `,${formattedOrFacets}` : ''