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
c829c1c4
Commit
c829c1c4
authored
5 years ago
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removes EE differences for folder_view
parent
6fc43e6f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
49 additions
and
5 deletions
+49
-5
app/assets/javascripts/environments/folder/environments_folder_view.vue
...ascripts/environments/folder/environments_folder_view.vue
+9
-2
app/assets/javascripts/environments/mixins/environments_folder_view_mixin.js
...pts/environments/mixins/environments_folder_view_mixin.js
+29
-0
spec/javascripts/environments/folder/environments_folder_view_spec.js
...ipts/environments/folder/environments_folder_view_spec.js
+11
-3
No files found.
app/assets/javascripts/environments/folder/environments_folder_view.vue
View file @
c829c1c4
<
script
>
<
script
>
import
folderMixin
from
'
ee_else_ce/environments/mixins/environments_folder_view_mixin
'
;
import
environmentsMixin
from
'
../mixins/environments_mixin
'
;
import
environmentsMixin
from
'
../mixins/environments_mixin
'
;
import
CIPaginationMixin
from
'
../../vue_shared/mixins/ci_pagination_api_mixin
'
;
import
CIPaginationMixin
from
'
../../vue_shared/mixins/ci_pagination_api_mixin
'
;
import
StopEnvironmentModal
from
'
../components/stop_environment_modal.vue
'
;
import
StopEnvironmentModal
from
'
../components/stop_environment_modal.vue
'
;
...
@@ -8,7 +9,7 @@ export default {
...
@@ -8,7 +9,7 @@ export default {
StopEnvironmentModal
,
StopEnvironmentModal
,
},
},
mixins
:
[
environmentsMixin
,
CIPaginationMixin
],
mixins
:
[
environmentsMixin
,
CIPaginationMixin
,
folderMixin
],
props
:
{
props
:
{
endpoint
:
{
endpoint
:
{
...
@@ -41,7 +42,8 @@ export default {
...
@@ -41,7 +42,8 @@ export default {
<div
v-if=
"!isLoading"
class=
"top-area"
>
<div
v-if=
"!isLoading"
class=
"top-area"
>
<h4
class=
"js-folder-name environments-folder-name"
>
<h4
class=
"js-folder-name environments-folder-name"
>
{{
s__
(
'
Environments|Environments
'
)
}}
/
<b>
{{
folderName
}}
</b>
{{
s__
(
'
Environments|Environments
'
)
}}
/
<b>
{{
folderName
}}
</b>
</h4>
</h4>
<tabs
:tabs=
"tabs"
scope=
"environments"
@
onChangeTab=
"onChangeTab"
/>
<tabs
:tabs=
"tabs"
scope=
"environments"
@
onChangeTab=
"onChangeTab"
/>
...
@@ -52,6 +54,11 @@ export default {
...
@@ -52,6 +54,11 @@ export default {
:environments=
"state.environments"
:environments=
"state.environments"
:pagination=
"state.paginationInformation"
:pagination=
"state.paginationInformation"
:can-read-environment=
"canReadEnvironment"
:can-read-environment=
"canReadEnvironment"
:canary-deployment-feature-id=
"canaryDeploymentFeatureId"
:show-canary-deployment-callout=
"showCanaryDeploymentCallout"
:user-callouts-path=
"userCalloutsPath"
:lock-promotion-svg-path=
"lockPromotionSvgPath"
:help-canary-deployments-path=
"helpCanaryDeploymentsPath"
@
onChangePage=
"onChangePage"
@
onChangePage=
"onChangePage"
/>
/>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/environments/mixins/environments_folder_view_mixin.js
0 → 100644
View file @
c829c1c4
export
default
{
props
:
{
canaryDeploymentFeatureId
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
showCanaryDeploymentCallout
:
{
type
:
Boolean
,
required
:
false
,
default
:
false
,
},
userCalloutsPath
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
lockPromotionSvgPath
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
helpCanaryDeploymentsPath
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
},
};
This diff is collapsed.
Click to expand it.
spec/javascripts/environments/folder/environments_folder_view_spec.js
View file @
c829c1c4
...
@@ -3,6 +3,7 @@ import MockAdapter from 'axios-mock-adapter';
...
@@ -3,6 +3,7 @@ import MockAdapter from 'axios-mock-adapter';
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
environmentsFolderViewComponent
from
'
~/environments/folder/environments_folder_view.vue
'
;
import
environmentsFolderViewComponent
from
'
~/environments/folder/environments_folder_view.vue
'
;
import
mountComponent
from
'
spec/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec/helpers/vue_mount_component_helper
'
;
import
{
removeBreakLine
,
removeWhitespace
}
from
'
spec/helpers/vue_component_helper
'
;
import
{
environmentsList
}
from
'
../mock_data
'
;
import
{
environmentsList
}
from
'
../mock_data
'
;
describe
(
'
Environments Folder View
'
,
()
=>
{
describe
(
'
Environments Folder View
'
,
()
=>
{
...
@@ -15,6 +16,11 @@ describe('Environments Folder View', () => {
...
@@ -15,6 +16,11 @@ describe('Environments Folder View', () => {
folderName
:
'
review
'
,
folderName
:
'
review
'
,
canReadEnvironment
:
true
,
canReadEnvironment
:
true
,
cssContainerClass
:
'
container
'
,
cssContainerClass
:
'
container
'
,
canaryDeploymentFeatureId
:
'
canary_deployment
'
,
showCanaryDeploymentCallout
:
true
,
userCalloutsPath
:
'
/callouts
'
,
lockPromotionSvgPath
:
'
/assets/illustrations/lock-promotion.svg
'
,
helpCanaryDeploymentsPath
:
'
help/canary-deployments
'
,
};
};
beforeEach
(()
=>
{
beforeEach
(()
=>
{
...
@@ -89,9 +95,11 @@ describe('Environments Folder View', () => {
...
@@ -89,9 +95,11 @@ describe('Environments Folder View', () => {
it
(
'
should render parent folder name
'
,
done
=>
{
it
(
'
should render parent folder name
'
,
done
=>
{
setTimeout
(()
=>
{
setTimeout
(()
=>
{
expect
(
component
.
$el
.
querySelector
(
'
.js-folder-name
'
).
textContent
.
trim
()).
toContain
(
expect
(
'
Environments / review
'
,
removeBreakLine
(
);
removeWhitespace
(
component
.
$el
.
querySelector
(
'
.js-folder-name
'
).
textContent
.
trim
()),
),
).
toContain
(
'
Environments / review
'
);
done
();
done
();
},
0
);
},
0
);
});
});
...
...
This diff is collapsed.
Click to expand it.
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