Skip to content

ui: refactor advisories enabled usage and more #12676

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
shwstppr wants to merge 6 commits into
base: main
Choose a base branch
from
Open

ui: refactor advisories enabled usage and more #12676

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c29dbab
ui: refactor advisories enabled usage
shwstppr Feb 21, 2026
4cd2868
add in config
shwstppr Feb 21, 2026
19e8477
more advisories
shwstppr Feb 21, 2026
3367c74
fix
shwstppr Apr 10, 2026
6ca2263
Merge remote-tracking branch 'apache/main' into ui-adv-improv
shwstppr Apr 10, 2026
f99fbb4
Merge branch 'main' into ui-adv-improv
shwstppr Apr 14, 2026
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
3 changes: 2 additions & 1 deletion ui/public/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,5 +116,6 @@
"message": "🤔 <strong>Sample Announcement</strong>: New Feature Available: Check out our latest dashboard improvements! <a href='/features'>Learn more</a>",
"startDate": "2025-06-01T00:00:00Z",
"endDate": "2025-07-16T00:00:00Z"
}
},
"advisoriesDisabled": false
}
6 changes: 4 additions & 2 deletions ui/src/config/router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ import tools from '@/config/section/tools'
import quota from '@/config/section/plugin/quota'
import cloudian from '@/config/section/plugin/cloudian'

const isAdvisoriesDisabled = () => vueProps.$config.advisoriesDisabled ?? false

function generateRouterMap (section) {
var map = {
name: section.name,
Expand Down Expand Up @@ -81,7 +83,7 @@ function generateRouterMap (section) {
filters: child.filters,
params: child.params ? child.params : {},
columns: child.columns,
advisories: !vueProps.$config.advisoriesDisabled ? child.advisories : undefined,
advisories: !isAdvisoriesDisabled() ? child.advisories : undefined,
details: child.details,
searchFilters: child.searchFilters,
related: child.related,
Expand Down Expand Up @@ -181,7 +183,7 @@ function generateRouterMap (section) {
map.meta.columns = section.columns
}

if (!vueProps.$config.advisoriesDisabled && section.advisories) {
if (!isAdvisoriesDisabled() && section.advisories) {
map.meta.advisories = section.advisories
}

Expand Down
Loading