Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
f473eb36
Commit
f473eb36
authored
Jul 05, 2021
by
Paul Gascou-Vaillancourt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move environement picker to filters dir
parent
0efdbdd0
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
8 additions
and
8 deletions
+8
-8
ee/app/assets/javascripts/threat_monitoring/components/filters/environment_picker.vue
...reat_monitoring/components/filters/environment_picker.vue
+1
-1
ee/app/assets/javascripts/threat_monitoring/components/policy_editor/policy_editor.vue
...eat_monitoring/components/policy_editor/policy_editor.vue
+1
-1
ee/app/assets/javascripts/threat_monitoring/components/policy_list.vue
.../javascripts/threat_monitoring/components/policy_list.vue
+1
-1
ee/app/assets/javascripts/threat_monitoring/components/threat_monitoring_filters.vue
...hreat_monitoring/components/threat_monitoring_filters.vue
+1
-1
ee/spec/frontend/threat_monitoring/components/filters/environment_picker_spec.js
..._monitoring/components/filters/environment_picker_spec.js
+2
-2
ee/spec/frontend/threat_monitoring/components/policy_editor/policy_editor_spec.js
...monitoring/components/policy_editor/policy_editor_spec.js
+1
-1
ee/spec/frontend/threat_monitoring/components/threat_monitoring_filters_spec.js
...t_monitoring/components/threat_monitoring_filters_spec.js
+1
-1
No files found.
ee/app/assets/javascripts/threat_monitoring/components/environment_picker.vue
→
ee/app/assets/javascripts/threat_monitoring/components/
filters/
environment_picker.vue
View file @
f473eb36
<
script
>
import
{
GlFormGroup
,
GlDropdown
,
GlDropdownItem
}
from
'
@gitlab/ui
'
;
import
{
mapActions
,
mapGetters
,
mapState
}
from
'
vuex
'
;
import
{
ALL_ENVIRONMENT_NAME
}
from
'
../constants
'
;
import
{
ALL_ENVIRONMENT_NAME
}
from
'
../
../
constants
'
;
export
default
{
components
:
{
...
...
ee/app/assets/javascripts/threat_monitoring/components/policy_editor/policy_editor.vue
View file @
f473eb36
...
...
@@ -2,7 +2,7 @@
import
{
GlFormGroup
,
GlFormSelect
}
from
'
@gitlab/ui
'
;
import
{
mapActions
}
from
'
vuex
'
;
import
glFeatureFlagMixin
from
'
~/vue_shared/mixins/gl_feature_flags_mixin
'
;
import
EnvironmentPicker
from
'
../environment_picker.vue
'
;
import
EnvironmentPicker
from
'
../
filters/
environment_picker.vue
'
;
import
{
POLICY_KIND_OPTIONS
}
from
'
./constants
'
;
import
NetworkPolicyEditor
from
'
./network_policy/network_policy_editor.vue
'
;
import
ScanExecutionPolicyEditor
from
'
./scan_execution_policy/scan_execution_policy_editor.vue
'
;
...
...
ee/app/assets/javascripts/threat_monitoring/components/policy_list.vue
View file @
f473eb36
...
...
@@ -17,7 +17,7 @@ import { setUrlFragment, mergeUrlParams } from '~/lib/utils/url_utility';
import
{
__
,
s__
}
from
'
~/locale
'
;
import
networkPoliciesQuery
from
'
../graphql/queries/network_policies.query.graphql
'
;
import
scanExecutionPoliciesQuery
from
'
../graphql/queries/scan_execution_policies.query.graphql
'
;
import
EnvironmentPicker
from
'
./environment_picker.vue
'
;
import
EnvironmentPicker
from
'
./
filters/
environment_picker.vue
'
;
import
PolicyDrawer
from
'
./policy_drawer/policy_drawer.vue
'
;
const
createPolicyFetchError
=
({
gqlError
,
networkError
})
=>
{
...
...
ee/app/assets/javascripts/threat_monitoring/components/threat_monitoring_filters.vue
View file @
f473eb36
...
...
@@ -3,7 +3,7 @@ import { GlFormGroup } from '@gitlab/ui';
import
{
mapActions
,
mapGetters
}
from
'
vuex
'
;
import
DateTimePicker
from
'
~/vue_shared/components/date_time_picker/date_time_picker.vue
'
;
import
{
timeRanges
,
defaultTimeRange
}
from
'
~/vue_shared/constants
'
;
import
EnvironmentPicker
from
'
./environment_picker.vue
'
;
import
EnvironmentPicker
from
'
./
filters/
environment_picker.vue
'
;
export
default
{
name
:
'
ThreatMonitoringFilters
'
,
...
...
ee/spec/frontend/threat_monitoring/components/environment_picker_spec.js
→
ee/spec/frontend/threat_monitoring/components/
filters/
environment_picker_spec.js
View file @
f473eb36
import
{
GlDropdown
,
GlDropdownItem
}
from
'
@gitlab/ui
'
;
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
EnvironmentPicker
from
'
ee/threat_monitoring/components/environment_picker.vue
'
;
import
EnvironmentPicker
from
'
ee/threat_monitoring/components/
filters/
environment_picker.vue
'
;
import
{
INVALID_CURRENT_ENVIRONMENT_NAME
,
ALL_ENVIRONMENT_NAME
,
}
from
'
ee/threat_monitoring/constants
'
;
import
createStore
from
'
ee/threat_monitoring/store
'
;
import
{
mockEnvironmentsResponse
}
from
'
../mocks/mock_data
'
;
import
{
mockEnvironmentsResponse
}
from
'
../
../
mocks/mock_data
'
;
const
mockEnvironments
=
mockEnvironmentsResponse
.
environments
;
const
currentEnvironment
=
mockEnvironments
[
1
];
...
...
ee/spec/frontend/threat_monitoring/components/policy_editor/policy_editor_spec.js
View file @
f473eb36
import
{
GlFormSelect
}
from
'
@gitlab/ui
'
;
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
EnvironmentPicker
from
'
ee/threat_monitoring/components/environment_picker.vue
'
;
import
EnvironmentPicker
from
'
ee/threat_monitoring/components/
filters/
environment_picker.vue
'
;
import
{
POLICY_KIND_OPTIONS
}
from
'
ee/threat_monitoring/components/policy_editor/constants
'
;
import
NetworkPolicyEditor
from
'
ee/threat_monitoring/components/policy_editor/network_policy/network_policy_editor.vue
'
;
import
PolicyEditor
from
'
ee/threat_monitoring/components/policy_editor/policy_editor.vue
'
;
...
...
ee/spec/frontend/threat_monitoring/components/threat_monitoring_filters_spec.js
View file @
f473eb36
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
EnvironmentPicker
from
'
ee/threat_monitoring/components/environment_picker.vue
'
;
import
EnvironmentPicker
from
'
ee/threat_monitoring/components/
filters/
environment_picker.vue
'
;
import
ThreatMonitoringFilters
from
'
ee/threat_monitoring/components/threat_monitoring_filters.vue
'
;
import
createStore
from
'
ee/threat_monitoring/store
'
;
import
DateTimePicker
from
'
~/vue_shared/components/date_time_picker/date_time_picker.vue
'
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment