Commit a053bb48 authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch '230413-move-settings-page' into 'master'

Prepare the backend code for instance level security dashboard settings page

See merge request gitlab-org/gitlab!38948
parents 49848d08 380b977c
import initSecurityDashboardSettings from 'ee/security_dashboard/instance_dashboard_settings_init';
document.addEventListener('DOMContentLoaded', () => {
initSecurityDashboardSettings(document.getElementById('js-security'));
});
import Vue from 'vue';
import UnavailableState from './components/unavailable_state.vue';
export default el => {
return new Vue({
el,
render(createElement) {
return createElement(UnavailableState, {
props: {
link: el.dataset.dashboardDocumentation,
svgPath: el.dataset.emptyStateSvgPath,
},
});
},
});
};
...@@ -13,5 +13,15 @@ ...@@ -13,5 +13,15 @@
= sprite_icon('dashboard') = sprite_icon('dashboard')
%span.nav-item-name %span.nav-item-name
= _('Security Dashboard') = _('Security Dashboard')
-# This part will be enabled in a follow up MR. The follow up MR will be submitted
-# right after this MR is merged. The reason to split the MR into two pieces is
-# to reduce the size of the MR and speed up the review process.
-#
-# = nav_link(path: %w[dashboard#settings]) do
-# = link_to security_settings_dashboard_path, class: 'shortcuts-project rspec-project-link' do
-# .nav-icon-container
-# = sprite_icon('settings')
-# %span.nav-item-name
-# = _('Settings')
= render 'shared/sidebar_toggle_button' = render 'shared/sidebar_toggle_button'
- page_title _('Security Dashboard - Settings')
- @hide_breadcrumbs = true
#js-security{ data: instance_security_dashboard_data }
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
namespace :security do namespace :security do
root to: 'dashboard#show' root to: 'dashboard#show'
get 'dasboard/settings', to: 'dashboard#settings', as: :settings_dashboard
resources :projects, only: [:index, :create, :destroy] resources :projects, only: [:index, :create, :destroy]
resources :vulnerable_projects, only: [:index] resources :vulnerable_projects, only: [:index]
......
...@@ -21399,6 +21399,9 @@ msgstr "" ...@@ -21399,6 +21399,9 @@ msgstr ""
msgid "Security Dashboard" msgid "Security Dashboard"
msgstr "" msgstr ""
msgid "Security Dashboard - Settings"
msgstr ""
msgid "Security dashboard" msgid "Security dashboard"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment