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
db1f9ca0
Commit
db1f9ca0
authored
Apr 24, 2020
by
Emily Ring
Committed by
Natalia Tepluhina
Apr 24, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed undeeded vue mixin
Combine environments_table_mixin.js with environments_table.vue
parent
f79ec5e6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
44 deletions
+31
-44
app/assets/javascripts/environments/components/environments_table.vue
...avascripts/environments/components/environments_table.vue
+31
-2
app/assets/javascripts/environments/mixins/environments_table_mixin.js
...vascripts/environments/mixins/environments_table_mixin.js
+0
-10
ee/app/assets/javascripts/environments/mixins/environments_table_mixin.js
...vascripts/environments/mixins/environments_table_mixin.js
+0
-32
No files found.
app/assets/javascripts/environments/components/environments_table.vue
View file @
db1f9ca0
...
...
@@ -4,7 +4,6 @@
*/
import
{
GlLoadingIcon
}
from
'
@gitlab/ui
'
;
import
{
flow
,
reverse
,
sortBy
}
from
'
lodash/fp
'
;
import
environmentTableMixin
from
'
ee_else_ce/environments/mixins/environments_table_mixin
'
;
import
{
s__
}
from
'
~/locale
'
;
import
EnvironmentItem
from
'
./environment_item.vue
'
;
...
...
@@ -16,7 +15,6 @@ export default {
CanaryDeploymentCallout
:
()
=>
import
(
'
ee_component/environments/components/canary_deployment_callout.vue
'
),
},
mixins
:
[
environmentTableMixin
],
props
:
{
environments
:
{
type
:
Array
,
...
...
@@ -33,6 +31,31 @@ export default {
required
:
false
,
default
:
false
,
},
canaryDeploymentFeatureId
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
helpCanaryDeploymentsPath
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
lockPromotionSvgPath
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
showCanaryDeploymentCallout
:
{
type
:
Boolean
,
required
:
false
,
default
:
false
,
},
userCalloutsPath
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
},
computed
:
{
sortedEnvironments
()
{
...
...
@@ -79,9 +102,15 @@ export default {
folderUrl
(
model
)
{
return
`
${
window
.
location
.
pathname
}
/folders/
${
model
.
folderName
}
`
;
},
shouldRenderDeployBoard
(
model
)
{
return
model
.
hasDeployBoard
&&
model
.
isDeployBoardVisible
;
},
shouldRenderFolderContent
(
env
)
{
return
env
.
isFolder
&&
env
.
isOpen
&&
env
.
children
&&
env
.
children
.
length
>
0
;
},
shouldShowCanaryCallout
(
env
)
{
return
env
.
showCanaryCallout
&&
this
.
showCanaryDeploymentCallout
;
},
sortEnvironments
(
environments
)
{
/*
* The sorting algorithm should sort in the following priorities:
...
...
app/assets/javascripts/environments/mixins/environments_table_mixin.js
deleted
100644 → 0
View file @
f79ec5e6
export
default
{
methods
:
{
shouldShowCanaryCallout
()
{
return
false
;
},
shouldRenderDeployBoard
()
{
return
false
;
},
},
};
ee/app/assets/javascripts/environments/mixins/environments_table_mixin.js
deleted
100644 → 0
View file @
f79ec5e6
export
default
{
props
:
{
canaryDeploymentFeatureId
:
{
type
:
String
,
required
:
true
,
},
showCanaryDeploymentCallout
:
{
type
:
Boolean
,
required
:
true
,
},
userCalloutsPath
:
{
type
:
String
,
required
:
true
,
},
lockPromotionSvgPath
:
{
type
:
String
,
required
:
true
,
},
helpCanaryDeploymentsPath
:
{
type
:
String
,
required
:
true
,
},
},
methods
:
{
shouldShowCanaryCallout
(
env
)
{
return
env
.
showCanaryCallout
&&
this
.
showCanaryDeploymentCallout
;
},
shouldRenderDeployBoard
(
model
)
{
return
model
.
hasDeployBoard
&&
model
.
isDeployBoardVisible
;
},
},
};
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