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
96ed4677
Commit
96ed4677
authored
Dec 23, 2020
by
Lukas Eipert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Run prettier on 31 files - 36 of 73
Part of our prettier migration; changing the arrow-parens style.
parent
72c11eb5
Changes
32
Show whitespace changes
Inline
Side-by-side
Showing
32 changed files
with
65 additions
and
98 deletions
+65
-98
.prettierignore
.prettierignore
+0
-33
ee/app/assets/javascripts/boards/components/sidebar/remove_issue.js
...ets/javascripts/boards/components/sidebar/remove_issue.js
+4
-4
ee/app/assets/javascripts/boards/config_toggle.js
ee/app/assets/javascripts/boards/config_toggle.js
+2
-2
ee/app/assets/javascripts/boards/ee_functions.js
ee/app/assets/javascripts/boards/ee_functions.js
+1
-1
ee/app/assets/javascripts/boards/mixins/modal_footer.js
ee/app/assets/javascripts/boards/mixins/modal_footer.js
+1
-1
ee/app/assets/javascripts/boards/models/list.js
ee/app/assets/javascripts/boards/models/list.js
+2
-2
ee/app/assets/javascripts/boards/stores/actions.js
ee/app/assets/javascripts/boards/stores/actions.js
+1
-1
ee/app/assets/javascripts/boards/stores/boards_store_ee.js
ee/app/assets/javascripts/boards/stores/boards_store_ee.js
+6
-6
ee/app/assets/javascripts/boards/stores/mutations.js
ee/app/assets/javascripts/boards/stores/mutations.js
+6
-6
ee/app/assets/javascripts/boards/toggle_labels.js
ee/app/assets/javascripts/boards/toggle_labels.js
+1
-1
ee/app/assets/javascripts/burndown_chart/burn_chart_data.js
ee/app/assets/javascripts/burndown_chart/burn_chart_data.js
+5
-5
ee/app/assets/javascripts/burndown_chart/components/burn_charts.vue
...ets/javascripts/burndown_chart/components/burn_charts.vue
+6
-6
ee/app/assets/javascripts/burndown_chart/components/burnup_chart.vue
...ts/javascripts/burndown_chart/components/burnup_chart.vue
+1
-1
ee/app/assets/javascripts/burndown_chart/components/open_timebox_summary.vue
...cripts/burndown_chart/components/open_timebox_summary.vue
+2
-2
ee/app/assets/javascripts/clusters/components/environments.vue
...p/assets/javascripts/clusters/components/environments.vue
+3
-3
ee/app/assets/javascripts/clusters/mixins/track_uninstall_button_click.js
...vascripts/clusters/mixins/track_uninstall_button_click.js
+1
-1
ee/app/assets/javascripts/clusters_list/components/agents.vue
...pp/assets/javascripts/clusters_list/components/agents.vue
+2
-2
ee/app/assets/javascripts/codequality_report/store/actions.js
...pp/assets/javascripts/codequality_report/store/actions.js
+1
-1
ee/app/assets/javascripts/codequality_report/store/getters.js
...pp/assets/javascripts/codequality_report/store/getters.js
+2
-2
ee/app/assets/javascripts/compliance_dashboard/compliance_dashboard_bundle.js
...ripts/compliance_dashboard/compliance_dashboard_bundle.js
+1
-1
ee/app/assets/javascripts/dependencies/components/dependencies_actions.vue
...ascripts/dependencies/components/dependencies_actions.vue
+1
-1
ee/app/assets/javascripts/dependencies/components/paginated_dependencies_table.vue
.../dependencies/components/paginated_dependencies_table.vue
+1
-1
ee/app/assets/javascripts/dependencies/store/getters.js
ee/app/assets/javascripts/dependencies/store/getters.js
+1
-1
ee/app/assets/javascripts/dependencies/store/modules/list/actions.js
...ts/javascripts/dependencies/store/modules/list/actions.js
+2
-2
ee/app/assets/javascripts/diffs/mixins/image_diff.js
ee/app/assets/javascripts/diffs/mixins/image_diff.js
+1
-1
ee/app/assets/javascripts/droplab/plugins/custom_number.js
ee/app/assets/javascripts/droplab/plugins/custom_number.js
+1
-1
ee/app/assets/javascripts/ee_trial_banner/ee_trial_banner.js
ee/app/assets/javascripts/ee_trial_banner/ee_trial_banner.js
+1
-1
ee/app/assets/javascripts/environments/stores/environments_store.js
...ets/javascripts/environments/stores/environments_store.js
+1
-1
ee/app/assets/javascripts/epic/components/epic_form.vue
ee/app/assets/javascripts/epic/components/epic_form.vue
+2
-2
ee/app/assets/javascripts/epic/components/sidebar_items/sidebar_labels.vue
...ascripts/epic/components/sidebar_items/sidebar_labels.vue
+3
-3
ee/app/assets/javascripts/epic/epic_bundle.js
ee/app/assets/javascripts/epic/epic_bundle.js
+2
-2
ee/app/assets/javascripts/epic/epic_tabs.js
ee/app/assets/javascripts/epic/epic_tabs.js
+1
-1
No files found.
.prettierignore
View file @
96ed4677
...
@@ -1020,39 +1020,6 @@ ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/duration_chart
...
@@ -1020,39 +1020,6 @@ ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/duration_chart
ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/type_of_work/actions.js
ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/type_of_work/actions.js
ee/app/assets/javascripts/analytics/cycle_analytics/store/mutations.js
ee/app/assets/javascripts/analytics/cycle_analytics/store/mutations.js
## great-keldysh
ee/app/assets/javascripts/boards/components/sidebar/remove_issue.js
ee/app/assets/javascripts/boards/config_toggle.js
ee/app/assets/javascripts/boards/ee_functions.js
ee/app/assets/javascripts/boards/mixins/modal_footer.js
ee/app/assets/javascripts/boards/models/list.js
ee/app/assets/javascripts/boards/stores/actions.js
ee/app/assets/javascripts/boards/stores/boards_store_ee.js
ee/app/assets/javascripts/boards/stores/mutations.js
ee/app/assets/javascripts/boards/toggle_labels.js
ee/app/assets/javascripts/burndown_chart/burn_chart_data.js
ee/app/assets/javascripts/burndown_chart/components/burn_charts.vue
ee/app/assets/javascripts/burndown_chart/components/burnup_chart.vue
ee/app/assets/javascripts/burndown_chart/components/open_timebox_summary.vue
ee/app/assets/javascripts/clusters/components/environments.vue
ee/app/assets/javascripts/clusters/mixins/track_uninstall_button_click.js
ee/app/assets/javascripts/clusters_list/components/agents.vue
ee/app/assets/javascripts/codequality_report/store/actions.js
ee/app/assets/javascripts/codequality_report/store/getters.js
ee/app/assets/javascripts/compliance_dashboard/compliance_dashboard_bundle.js
ee/app/assets/javascripts/dependencies/components/dependencies_actions.vue
ee/app/assets/javascripts/dependencies/components/paginated_dependencies_table.vue
ee/app/assets/javascripts/dependencies/store/getters.js
ee/app/assets/javascripts/dependencies/store/modules/list/actions.js
ee/app/assets/javascripts/diffs/mixins/image_diff.js
ee/app/assets/javascripts/droplab/plugins/custom_number.js
ee/app/assets/javascripts/ee_trial_banner/ee_trial_banner.js
ee/app/assets/javascripts/environments/stores/environments_store.js
ee/app/assets/javascripts/epic/components/epic_form.vue
ee/app/assets/javascripts/epic/components/sidebar_items/sidebar_labels.vue
ee/app/assets/javascripts/epic/epic_bundle.js
ee/app/assets/javascripts/epic/epic_tabs.js
## stoic-einstein
## stoic-einstein
ee/app/assets/javascripts/epic/store/actions.js
ee/app/assets/javascripts/epic/store/actions.js
ee/app/assets/javascripts/epic/store/mutations.js
ee/app/assets/javascripts/epic/store/mutations.js
...
...
ee/app/assets/javascripts/boards/components/sidebar/remove_issue.js
View file @
96ed4677
...
@@ -7,9 +7,9 @@ export default {
...
@@ -7,9 +7,9 @@ export default {
seedPatchRequest
(
issue
,
req
)
{
seedPatchRequest
(
issue
,
req
)
{
/* eslint-disable no-param-reassign */
/* eslint-disable no-param-reassign */
const
board
=
boardsStore
.
state
.
currentBoard
;
const
board
=
boardsStore
.
state
.
currentBoard
;
const
boardLabelIds
=
board
.
labels
.
map
(
label
=>
label
.
id
);
const
boardLabelIds
=
board
.
labels
.
map
(
(
label
)
=>
label
.
id
);
req
.
label_ids
=
req
.
label_ids
.
filter
(
id
=>
!
boardLabelIds
.
includes
(
id
));
req
.
label_ids
=
req
.
label_ids
.
filter
(
(
id
)
=>
!
boardLabelIds
.
includes
(
id
));
if
(
board
.
milestone_id
)
{
if
(
board
.
milestone_id
)
{
req
.
milestone_id
=
-
1
;
req
.
milestone_id
=
-
1
;
...
@@ -21,8 +21,8 @@ export default {
...
@@ -21,8 +21,8 @@ export default {
const
boardAssignee
=
board
.
assignee
?
board
.
assignee
.
id
:
null
;
const
boardAssignee
=
board
.
assignee
?
board
.
assignee
.
id
:
null
;
const
assigneeIds
=
issue
.
assignees
const
assigneeIds
=
issue
.
assignees
.
map
(
assignee
=>
assignee
.
id
)
.
map
(
(
assignee
)
=>
assignee
.
id
)
.
filter
(
id
=>
id
!==
boardAssignee
);
.
filter
(
(
id
)
=>
id
!==
boardAssignee
);
return
{
return
{
...
req
,
...
req
,
...
...
ee/app/assets/javascripts/boards/config_toggle.js
View file @
96ed4677
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
import
{
GlButton
,
GlModalDirective
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
{
GlButton
,
GlModalDirective
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
{
s__
,
__
}
from
'
~/locale
'
;
import
{
s__
,
__
}
from
'
~/locale
'
;
export
default
boardsStore
=>
{
export
default
(
boardsStore
)
=>
{
const
configEl
=
document
.
querySelector
(
'
.js-board-config
'
);
const
configEl
=
document
.
querySelector
(
'
.js-board-config
'
);
if
(
configEl
)
{
if
(
configEl
)
{
...
@@ -31,7 +31,7 @@ export default boardsStore => {
...
@@ -31,7 +31,7 @@ export default boardsStore => {
},
},
},
},
methods
:
{
methods
:
{
showPage
:
page
=>
boardsStore
.
showPage
(
page
),
showPage
:
(
page
)
=>
boardsStore
.
showPage
(
page
),
},
},
template
:
`
template
:
`
<div class="gl-ml-3">
<div class="gl-ml-3">
...
...
ee/app/assets/javascripts/boards/ee_functions.js
View file @
96ed4677
...
@@ -5,7 +5,7 @@ export const setEpicFetchingState = (issue, value) => {
...
@@ -5,7 +5,7 @@ export const setEpicFetchingState = (issue, value) => {
issue
.
setFetchingState
(
'
epic
'
,
value
);
issue
.
setFetchingState
(
'
epic
'
,
value
);
};
};
export
const
getMilestoneTitle
=
$boardApp
=>
({
export
const
getMilestoneTitle
=
(
$boardApp
)
=>
({
milestoneTitle
:
$boardApp
.
dataset
.
boardMilestoneTitle
,
milestoneTitle
:
$boardApp
.
dataset
.
boardMilestoneTitle
,
});
});
...
...
ee/app/assets/javascripts/boards/mixins/modal_footer.js
View file @
96ed4677
...
@@ -2,7 +2,7 @@ export default {
...
@@ -2,7 +2,7 @@ export default {
methods
:
{
methods
:
{
buildUpdateRequest
(
list
)
{
buildUpdateRequest
(
list
)
{
const
{
currentBoard
}
=
this
.
state
;
const
{
currentBoard
}
=
this
.
state
;
const
boardLabelIds
=
currentBoard
.
labels
.
map
(
label
=>
label
.
id
);
const
boardLabelIds
=
currentBoard
.
labels
.
map
(
(
label
)
=>
label
.
id
);
const
assigneeIds
=
currentBoard
.
assignee
&&
[
currentBoard
.
assignee
.
id
];
const
assigneeIds
=
currentBoard
.
assignee
&&
[
currentBoard
.
assignee
.
id
];
return
{
return
{
...
...
ee/app/assets/javascripts/boards/models/list.js
View file @
96ed4677
...
@@ -10,7 +10,7 @@ class ListEE extends List {
...
@@ -10,7 +10,7 @@ class ListEE extends List {
}
}
getIssues
(...
args
)
{
getIssues
(...
args
)
{
return
super
.
getIssues
(...
args
).
then
(
data
=>
{
return
super
.
getIssues
(...
args
).
then
(
(
data
)
=>
{
this
.
totalWeight
=
data
.
total_weight
;
this
.
totalWeight
=
data
.
total_weight
;
});
});
}
}
...
@@ -38,7 +38,7 @@ class ListEE extends List {
...
@@ -38,7 +38,7 @@ class ListEE extends List {
onNewIssueResponse
(
issue
,
data
)
{
onNewIssueResponse
(
issue
,
data
)
{
issue
.
milestone
=
data
.
milestone
?
new
ListMilestone
(
data
.
milestone
)
:
data
.
milestone
;
issue
.
milestone
=
data
.
milestone
?
new
ListMilestone
(
data
.
milestone
)
:
data
.
milestone
;
issue
.
assignees
=
Array
.
isArray
(
data
.
assignees
)
issue
.
assignees
=
Array
.
isArray
(
data
.
assignees
)
?
data
.
assignees
.
map
(
assignee
=>
new
ListAssignee
(
assignee
))
?
data
.
assignees
.
map
(
(
assignee
)
=>
new
ListAssignee
(
assignee
))
:
data
.
assignees
;
:
data
.
assignees
;
issue
.
labels
=
data
.
labels
;
issue
.
labels
=
data
.
labels
;
...
...
ee/app/assets/javascripts/boards/stores/actions.js
View file @
96ed4677
...
@@ -144,7 +144,7 @@ export default {
...
@@ -144,7 +144,7 @@ export default {
})
})
.
then
(({
data
})
=>
{
.
then
(({
data
})
=>
{
const
{
epics
,
lists
}
=
data
[
boardType
]?.
board
;
const
{
epics
,
lists
}
=
data
[
boardType
]?.
board
;
const
epicsFormatted
=
epics
.
edges
.
map
(
e
=>
({
const
epicsFormatted
=
epics
.
edges
.
map
(
(
e
)
=>
({
...
e
.
node
,
...
e
.
node
,
}));
}));
...
...
ee/app/assets/javascripts/boards/stores/boards_store_ee.js
View file @
96ed4677
...
@@ -20,7 +20,7 @@ class BoardsStoreEE {
...
@@ -20,7 +20,7 @@ class BoardsStoreEE {
this
.
store
.
loadList
=
(
listPath
,
listType
)
=>
this
.
loadList
(
listPath
,
listType
);
this
.
store
.
loadList
=
(
listPath
,
listType
)
=>
this
.
loadList
(
listPath
,
listType
);
const
superSetCurrentBoard
=
this
.
store
.
setCurrentBoard
.
bind
(
this
.
store
);
const
superSetCurrentBoard
=
this
.
store
.
setCurrentBoard
.
bind
(
this
.
store
);
this
.
store
.
setCurrentBoard
=
board
=>
{
this
.
store
.
setCurrentBoard
=
(
board
)
=>
{
superSetCurrentBoard
(
board
);
superSetCurrentBoard
(
board
);
this
.
store
.
state
.
assignees
=
[];
this
.
store
.
state
.
assignees
=
[];
this
.
store
.
state
.
milestones
=
[];
this
.
store
.
state
.
milestones
=
[];
...
@@ -95,7 +95,7 @@ class BoardsStoreEE {
...
@@ -95,7 +95,7 @@ class BoardsStoreEE {
.
concat
(
.
concat
(
this
.
store
.
filter
.
path
this
.
store
.
filter
.
path
.
split
(
'
&
'
)
.
split
(
'
&
'
)
.
filter
(
param
=>
param
.
match
(
new
RegExp
(
`^
${
key
}
=(.*)$`
,
'
g
'
))
===
null
),
.
filter
(
(
param
)
=>
param
.
match
(
new
RegExp
(
`^
${
key
}
=(.*)$`
,
'
g
'
))
===
null
),
)
)
.
join
(
'
&
'
);
.
join
(
'
&
'
);
};
};
...
@@ -142,7 +142,7 @@ class BoardsStoreEE {
...
@@ -142,7 +142,7 @@ class BoardsStoreEE {
}
}
const
filterPath
=
this
.
store
.
filter
.
path
.
split
(
'
&
'
);
const
filterPath
=
this
.
store
.
filter
.
path
.
split
(
'
&
'
);
this
.
store
.
boardConfig
.
labels
.
forEach
(
label
=>
{
this
.
store
.
boardConfig
.
labels
.
forEach
(
(
label
)
=>
{
const
labelTitle
=
encodeURIComponent
(
label
.
title
);
const
labelTitle
=
encodeURIComponent
(
label
.
title
);
const
param
=
`label_name[]=
${
labelTitle
}
`
;
const
param
=
`label_name[]=
${
labelTitle
}
`
;
const
labelIndex
=
filterPath
.
indexOf
(
param
);
const
labelIndex
=
filterPath
.
indexOf
(
param
);
...
@@ -176,8 +176,8 @@ class BoardsStoreEE {
...
@@ -176,8 +176,8 @@ class BoardsStoreEE {
issue
.
setLoadingState
(
'
weight
'
,
true
);
issue
.
setLoadingState
(
'
weight
'
,
true
);
this
.
store
this
.
store
.
updateWeight
(
issue
.
sidebarInfoEndpoint
,
newWeight
)
.
updateWeight
(
issue
.
sidebarInfoEndpoint
,
newWeight
)
.
then
(
res
=>
res
.
data
)
.
then
(
(
res
)
=>
res
.
data
)
.
then
(
data
=>
{
.
then
(
(
data
)
=>
{
const
lists
=
issue
.
getLists
();
const
lists
=
issue
.
getLists
();
const
oldWeight
=
issue
.
weight
;
const
oldWeight
=
issue
.
weight
;
const
weightDiff
=
newWeight
-
oldWeight
;
const
weightDiff
=
newWeight
-
oldWeight
;
...
@@ -186,7 +186,7 @@ class BoardsStoreEE {
...
@@ -186,7 +186,7 @@ class BoardsStoreEE {
issue
.
updateData
({
issue
.
updateData
({
weight
:
data
.
weight
,
weight
:
data
.
weight
,
});
});
lists
.
forEach
(
list
=>
{
lists
.
forEach
(
(
list
)
=>
{
list
.
addWeight
(
weightDiff
);
list
.
addWeight
(
weightDiff
);
});
});
})
})
...
...
ee/app/assets/javascripts/boards/stores/mutations.js
View file @
96ed4677
...
@@ -59,7 +59,7 @@ export default {
...
@@ -59,7 +59,7 @@ export default {
Vue
.
set
(
state
.
boardLists
,
listId
,
list
);
Vue
.
set
(
state
.
boardLists
,
listId
,
list
);
},
},
[
mutationTypes
.
UPDATE_LIST_FAILURE
]:
state
=>
{
[
mutationTypes
.
UPDATE_LIST_FAILURE
]:
(
state
)
=>
{
state
.
error
=
s__
(
'
Boards|An error occurred while updating the list. Please try again.
'
);
state
.
error
=
s__
(
'
Boards|An error occurred while updating the list. Please try again.
'
);
},
},
...
@@ -100,12 +100,12 @@ export default {
...
@@ -100,12 +100,12 @@ export default {
Vue
.
set
(
state
.
epicsFlags
,
epicId
,
{
isLoading
:
false
});
Vue
.
set
(
state
.
epicsFlags
,
epicId
,
{
isLoading
:
false
});
},
},
[
mutationTypes
.
TOGGLE_EPICS_SWIMLANES
]:
state
=>
{
[
mutationTypes
.
TOGGLE_EPICS_SWIMLANES
]:
(
state
)
=>
{
state
.
isShowingEpicsSwimlanes
=
!
state
.
isShowingEpicsSwimlanes
;
state
.
isShowingEpicsSwimlanes
=
!
state
.
isShowingEpicsSwimlanes
;
state
.
epicsSwimlanesFetchInProgress
=
true
;
state
.
epicsSwimlanesFetchInProgress
=
true
;
},
},
[
mutationTypes
.
SET_EPICS_SWIMLANES
]:
state
=>
{
[
mutationTypes
.
SET_EPICS_SWIMLANES
]:
(
state
)
=>
{
state
.
isShowingEpicsSwimlanes
=
true
;
state
.
isShowingEpicsSwimlanes
=
true
;
state
.
epicsSwimlanesFetchInProgress
=
true
;
state
.
epicsSwimlanesFetchInProgress
=
true
;
},
},
...
@@ -115,7 +115,7 @@ export default {
...
@@ -115,7 +115,7 @@ export default {
state
.
epicsSwimlanesFetchInProgress
=
false
;
state
.
epicsSwimlanesFetchInProgress
=
false
;
},
},
[
mutationTypes
.
RECEIVE_SWIMLANES_FAILURE
]:
state
=>
{
[
mutationTypes
.
RECEIVE_SWIMLANES_FAILURE
]:
(
state
)
=>
{
state
.
error
=
s__
(
state
.
error
=
s__
(
'
Boards|An error occurred while fetching the board swimlanes. Please reload the page.
'
,
'
Boards|An error occurred while fetching the board swimlanes. Please reload the page.
'
,
);
);
...
@@ -133,7 +133,7 @@ export default {
...
@@ -133,7 +133,7 @@ export default {
Vue
.
set
(
state
,
'
epics
'
,
unionBy
(
state
.
epics
||
[],
epics
,
'
id
'
));
Vue
.
set
(
state
,
'
epics
'
,
unionBy
(
state
.
epics
||
[],
epics
,
'
id
'
));
},
},
[
mutationTypes
.
RESET_EPICS
]:
state
=>
{
[
mutationTypes
.
RESET_EPICS
]:
(
state
)
=>
{
Vue
.
set
(
state
,
'
epics
'
,
[]);
Vue
.
set
(
state
,
'
epics
'
,
[]);
},
},
...
@@ -159,7 +159,7 @@ export default {
...
@@ -159,7 +159,7 @@ export default {
[
mutationTypes
.
SET_BOARD_EPIC_USER_PREFERENCES
]:
(
state
,
val
)
=>
{
[
mutationTypes
.
SET_BOARD_EPIC_USER_PREFERENCES
]:
(
state
,
val
)
=>
{
const
{
userPreferences
,
epicId
}
=
val
;
const
{
userPreferences
,
epicId
}
=
val
;
const
epic
=
state
.
epics
.
filter
(
currentEpic
=>
currentEpic
.
id
===
epicId
)[
0
];
const
epic
=
state
.
epics
.
filter
(
(
currentEpic
)
=>
currentEpic
.
id
===
epicId
)[
0
];
if
(
epic
)
{
if
(
epic
)
{
Vue
.
set
(
epic
,
'
userPreferences
'
,
userPreferences
);
Vue
.
set
(
epic
,
'
userPreferences
'
,
userPreferences
);
...
...
ee/app/assets/javascripts/boards/toggle_labels.js
View file @
96ed4677
...
@@ -9,5 +9,5 @@ export default () =>
...
@@ -9,5 +9,5 @@ export default () =>
ToggleLabels
,
ToggleLabels
,
},
},
store
,
store
,
render
:
createElement
=>
createElement
(
'
toggle-labels
'
),
render
:
(
createElement
)
=>
createElement
(
'
toggle-labels
'
),
});
});
ee/app/assets/javascripts/burndown_chart/burn_chart_data.js
View file @
96ed4677
...
@@ -35,7 +35,7 @@ export default class BurnChartData {
...
@@ -35,7 +35,7 @@ export default class BurnChartData {
const
dateString
=
dateFormat
(
date
,
this
.
dateFormatMask
);
const
dateString
=
dateFormat
(
date
,
this
.
dateFormatMask
);
const
openedIssuesToday
=
this
.
filterAndSummarizeBurndownEvents
(
const
openedIssuesToday
=
this
.
filterAndSummarizeBurndownEvents
(
event
=>
(
event
)
=>
event
.
created_at
===
dateString
&&
event
.
created_at
===
dateString
&&
event
.
event_type
===
'
milestone
'
&&
event
.
event_type
===
'
milestone
'
&&
event
.
milestone_id
===
milestoneId
&&
event
.
milestone_id
===
milestoneId
&&
...
@@ -43,7 +43,7 @@ export default class BurnChartData {
...
@@ -43,7 +43,7 @@ export default class BurnChartData {
);
);
const
closedIssuesToday
=
this
.
filterAndSummarizeBurndownEvents
(
const
closedIssuesToday
=
this
.
filterAndSummarizeBurndownEvents
(
event
=>
(
event
)
=>
event
.
created_at
===
dateString
&&
event
.
created_at
===
dateString
&&
event
.
event_type
===
'
milestone
'
&&
event
.
event_type
===
'
milestone
'
&&
((
event
.
action
===
'
remove
'
&&
event
.
milestone_id
===
milestoneId
)
||
((
event
.
action
===
'
remove
'
&&
event
.
milestone_id
===
milestoneId
)
||
...
@@ -87,13 +87,13 @@ export default class BurnChartData {
...
@@ -87,13 +87,13 @@ export default class BurnChartData {
const
dateString
=
dateFormat
(
date
,
this
.
dateFormatMask
);
const
dateString
=
dateFormat
(
date
,
this
.
dateFormatMask
);
const
openedIssuesToday
=
this
.
filterAndSummarizeBurndownEvents
(
const
openedIssuesToday
=
this
.
filterAndSummarizeBurndownEvents
(
event
=>
(
event
)
=>
event
.
created_at
===
dateString
&&
event
.
created_at
===
dateString
&&
(
event
.
action
===
'
created
'
||
event
.
action
===
'
reopened
'
),
(
event
.
action
===
'
created
'
||
event
.
action
===
'
reopened
'
),
);
);
const
closedIssuesToday
=
this
.
filterAndSummarizeBurndownEvents
(
const
closedIssuesToday
=
this
.
filterAndSummarizeBurndownEvents
(
event
=>
event
.
created_at
===
dateString
&&
event
.
action
===
'
closed
'
,
(
event
)
=>
event
.
created_at
===
dateString
&&
event
.
action
===
'
closed
'
,
);
);
openIssuesCount
+=
openedIssuesToday
.
count
-
closedIssuesToday
.
count
;
openIssuesCount
+=
openedIssuesToday
.
count
-
closedIssuesToday
.
count
;
...
@@ -128,7 +128,7 @@ export default class BurnChartData {
...
@@ -128,7 +128,7 @@ export default class BurnChartData {
// 1. Set event creation date to milestone start date if created before milestone start
// 1. Set event creation date to milestone start date if created before milestone start
// 2. Convert event creation datetime to date in local timezone
// 2. Convert event creation datetime to date in local timezone
processRawEvents
(
events
)
{
processRawEvents
(
events
)
{
return
events
.
map
(
event
=>
({
return
events
.
map
(
(
event
)
=>
({
...
event
,
...
event
,
created_at
:
created_at
:
dateFormat
(
event
.
created_at
,
this
.
dateFormatMask
)
<
this
.
startDate
dateFormat
(
event
.
created_at
,
this
.
dateFormatMask
)
<
this
.
startDate
...
...
ee/app/assets/javascripts/burndown_chart/components/burn_charts.vue
View file @
96ed4677
...
@@ -170,7 +170,7 @@ export default {
...
@@ -170,7 +170,7 @@ export default {
axios
axios
.
get
(
this
.
burndownEventsPath
)
.
get
(
this
.
burndownEventsPath
)
.
then
(
burndownResponse
=>
{
.
then
(
(
burndownResponse
)
=>
{
const
burndownEvents
=
burndownResponse
.
data
;
const
burndownEvents
=
burndownResponse
.
data
;
const
burndownChartData
=
new
BurndownChartData
(
const
burndownChartData
=
new
BurndownChartData
(
burndownEvents
,
burndownEvents
,
...
@@ -178,8 +178,8 @@ export default {
...
@@ -178,8 +178,8 @@ export default {
this
.
dueDate
,
this
.
dueDate
,
).
generateBurndownTimeseries
();
).
generateBurndownTimeseries
();
this
.
openIssuesCount
=
burndownChartData
.
map
(
d
=>
[
d
[
0
],
d
[
1
]]);
this
.
openIssuesCount
=
burndownChartData
.
map
(
(
d
)
=>
[
d
[
0
],
d
[
1
]]);
this
.
openIssuesWeight
=
burndownChartData
.
map
(
d
=>
[
d
[
0
],
d
[
2
]]);
this
.
openIssuesWeight
=
burndownChartData
.
map
(
(
d
)
=>
[
d
[
0
],
d
[
2
]]);
})
})
.
catch
(()
=>
{
.
catch
(()
=>
{
this
.
fetchedLegacyData
=
false
;
this
.
fetchedLegacyData
=
false
;
...
@@ -187,7 +187,7 @@ export default {
...
@@ -187,7 +187,7 @@ export default {
});
});
},
},
pluckBurnupDataProperties
(
total
,
completed
)
{
pluckBurnupDataProperties
(
total
,
completed
)
{
return
this
.
burnupData
.
map
(
data
=>
{
return
this
.
burnupData
.
map
(
(
data
)
=>
{
return
[
data
.
date
,
data
[
total
]
-
data
[
completed
]];
return
[
data
.
date
,
data
[
total
]
-
data
[
completed
]];
});
});
},
},
...
@@ -203,7 +203,7 @@ export default {
...
@@ -203,7 +203,7 @@ export default {
padSparseBurnupData
(
sparseBurnupData
)
{
padSparseBurnupData
(
sparseBurnupData
)
{
// if we don't have data for the startDate, we still want to draw a point at 0
// if we don't have data for the startDate, we still want to draw a point at 0
// on the chart, so add an item to the start of the array
// on the chart, so add an item to the start of the array
const
hasDataForStartDate
=
sparseBurnupData
.
find
(
d
=>
d
.
date
===
this
.
startDate
);
const
hasDataForStartDate
=
sparseBurnupData
.
find
(
(
d
)
=>
d
.
date
===
this
.
startDate
);
if
(
!
hasDataForStartDate
)
{
if
(
!
hasDataForStartDate
)
{
sparseBurnupData
.
unshift
({
sparseBurnupData
.
unshift
({
date
:
this
.
startDate
,
date
:
this
.
startDate
,
...
@@ -222,7 +222,7 @@ export default {
...
@@ -222,7 +222,7 @@ export default {
// similar to the startDate padding, if we don't have a value for the
// similar to the startDate padding, if we don't have a value for the
// last item in the array, we should add one. If no events occur on
// last item in the array, we should add one. If no events occur on
// a day then we don't get any data for that day in the response
// a day then we don't get any data for that day in the response
const
hasDataForLastDate
=
sparseBurnupData
.
find
(
d
=>
d
.
date
===
lastDate
);
const
hasDataForLastDate
=
sparseBurnupData
.
find
(
(
d
)
=>
d
.
date
===
lastDate
);
if
(
!
hasDataForLastDate
)
{
if
(
!
hasDataForLastDate
)
{
const
lastItem
=
sparseBurnupData
[
sparseBurnupData
.
length
-
1
];
const
lastItem
=
sparseBurnupData
[
sparseBurnupData
.
length
-
1
];
sparseBurnupData
.
push
({
sparseBurnupData
.
push
({
...
...
ee/app/assets/javascripts/burndown_chart/components/burnup_chart.vue
View file @
96ed4677
...
@@ -81,7 +81,7 @@ export default {
...
@@ -81,7 +81,7 @@ export default {
methods
:
{
methods
:
{
// transform the object to a chart-friendly array of date + value
// transform the object to a chart-friendly array of date + value
transform
(
key
)
{
transform
(
key
)
{
return
this
.
burnupData
.
map
(
val
=>
[
val
.
date
,
val
[
key
]]);
return
this
.
burnupData
.
map
(
(
val
)
=>
[
val
.
date
,
val
[
key
]]);
},
},
formatTooltipText
(
params
)
{
formatTooltipText
(
params
)
{
const
[
total
,
completed
]
=
params
.
seriesData
;
const
[
total
,
completed
]
=
params
.
seriesData
;
...
...
ee/app/assets/javascripts/burndown_chart/components/open_timebox_summary.vue
View file @
96ed4677
...
@@ -36,13 +36,13 @@ export default {
...
@@ -36,13 +36,13 @@ export default {
type
:
String
,
type
:
String
,
required
:
false
,
required
:
false
,
default
:
Namespace
.
Group
,
default
:
Namespace
.
Group
,
validator
:
value
=>
Object
.
values
(
Namespace
).
includes
(
value
),
validator
:
(
value
)
=>
Object
.
values
(
Namespace
).
includes
(
value
),
},
},
displayValue
:
{
displayValue
:
{
type
:
String
,
type
:
String
,
required
:
false
,
required
:
false
,
default
:
Unit
.
count
,
default
:
Unit
.
count
,
validator
:
val
=>
Unit
[
val
],
validator
:
(
val
)
=>
Unit
[
val
],
},
},
},
},
data
()
{
data
()
{
...
...
ee/app/assets/javascripts/clusters/components/environments.vue
View file @
96ed4677
...
@@ -43,7 +43,7 @@ export default {
...
@@ -43,7 +43,7 @@ export default {
podsInUseCount
()
{
podsInUseCount
()
{
let
podsInUse
=
0
;
let
podsInUse
=
0
;
this
.
environments
.
forEach
(
environment
=>
{
this
.
environments
.
forEach
(
(
environment
)
=>
{
if
(
this
.
hasInstances
(
environment
.
rolloutStatus
))
{
if
(
this
.
hasInstances
(
environment
.
rolloutStatus
))
{
podsInUse
+=
environment
.
rolloutStatus
.
instances
.
length
;
podsInUse
+=
environment
.
rolloutStatus
.
instances
.
length
;
}
}
...
@@ -66,8 +66,8 @@ export default {
...
@@ -66,8 +66,8 @@ export default {
];
];
},
},
methods
:
{
methods
:
{
hasInstances
:
rolloutStatus
=>
rolloutStatus
.
instances
&&
rolloutStatus
.
instances
.
length
,
hasInstances
:
(
rolloutStatus
)
=>
rolloutStatus
.
instances
&&
rolloutStatus
.
instances
.
length
,
isLoadingRollout
:
rolloutStatus
=>
rolloutStatus
.
status
===
'
loading
'
,
isLoadingRollout
:
(
rolloutStatus
)
=>
rolloutStatus
.
status
===
'
loading
'
,
},
},
};
};
</
script
>
</
script
>
...
...
ee/app/assets/javascripts/clusters/mixins/track_uninstall_button_click.js
View file @
96ed4677
...
@@ -2,7 +2,7 @@ import Tracking from '~/tracking';
...
@@ -2,7 +2,7 @@ import Tracking from '~/tracking';
export
default
{
export
default
{
methods
:
{
methods
:
{
trackUninstallButtonClick
:
application
=>
{
trackUninstallButtonClick
:
(
application
)
=>
{
Tracking
.
event
(
'
k8s_cluster
'
,
'
uninstall
'
,
{
Tracking
.
event
(
'
k8s_cluster
'
,
'
uninstall
'
,
{
label
:
application
,
label
:
application
,
});
});
...
...
ee/app/assets/javascripts/clusters_list/components/agents.vue
View file @
96ed4677
...
@@ -14,7 +14,7 @@ export default {
...
@@ -14,7 +14,7 @@ export default {
projectPath
:
this
.
projectPath
,
projectPath
:
this
.
projectPath
,
};
};
},
},
update
:
data
=>
{
update
:
(
data
)
=>
{
return
{
return
{
list
:
data
?.
project
?.
clusterAgents
?.
nodes
,
list
:
data
?.
project
?.
clusterAgents
?.
nodes
,
folders
:
data
?.
project
?.
repository
?.
tree
?.
trees
?.
nodes
,
folders
:
data
?.
project
?.
repository
?.
tree
?.
trees
?.
nodes
,
...
@@ -52,7 +52,7 @@ export default {
...
@@ -52,7 +52,7 @@ export default {
const
configFolders
=
this
.
agents
?.
folders
;
const
configFolders
=
this
.
agents
?.
folders
;
if
(
list
&&
configFolders
)
{
if
(
list
&&
configFolders
)
{
list
=
list
.
map
(
agent
=>
{
list
=
list
.
map
(
(
agent
)
=>
{
const
configFolder
=
configFolders
.
find
(({
name
})
=>
name
===
agent
.
name
);
const
configFolder
=
configFolders
.
find
(({
name
})
=>
name
===
agent
.
name
);
return
{
...
agent
,
configFolder
};
return
{
...
agent
,
configFolder
};
});
});
...
...
ee/app/assets/javascripts/codequality_report/store/actions.js
View file @
96ed4677
...
@@ -23,7 +23,7 @@ export const fetchReport = ({ state, dispatch }) => {
...
@@ -23,7 +23,7 @@ export const fetchReport = ({ state, dispatch }) => {
if
(
!
state
.
blobPath
)
throw
new
Error
();
if
(
!
state
.
blobPath
)
throw
new
Error
();
dispatch
(
'
receiveReportSuccess
'
,
data
);
dispatch
(
'
receiveReportSuccess
'
,
data
);
})
})
.
catch
(
error
=>
{
.
catch
(
(
error
)
=>
{
dispatch
(
'
receiveReportError
'
,
error
);
dispatch
(
'
receiveReportError
'
,
error
);
createFlash
(
s__
(
'
ciReport|There was an error fetching the codequality report.
'
));
createFlash
(
s__
(
'
ciReport|There was an error fetching the codequality report.
'
));
});
});
...
...
ee/app/assets/javascripts/codequality_report/store/getters.js
View file @
96ed4677
export
const
codequalityIssues
=
state
=>
{
export
const
codequalityIssues
=
(
state
)
=>
{
const
{
page
,
perPage
}
=
state
.
pageInfo
;
const
{
page
,
perPage
}
=
state
.
pageInfo
;
const
start
=
(
page
-
1
)
*
perPage
;
const
start
=
(
page
-
1
)
*
perPage
;
return
state
.
allCodequalityIssues
.
slice
(
start
,
start
+
perPage
);
return
state
.
allCodequalityIssues
.
slice
(
start
,
start
+
perPage
);
};
};
export
const
codequalityIssueTotal
=
state
=>
state
.
allCodequalityIssues
.
length
;
export
const
codequalityIssueTotal
=
(
state
)
=>
state
.
allCodequalityIssues
.
length
;
ee/app/assets/javascripts/compliance_dashboard/compliance_dashboard_bundle.js
View file @
96ed4677
...
@@ -9,7 +9,7 @@ export default () => {
...
@@ -9,7 +9,7 @@ export default () => {
return
new
Vue
({
return
new
Vue
({
el
,
el
,
render
:
createElement
=>
render
:
(
createElement
)
=>
createElement
(
ComplianceDashboard
,
{
createElement
(
ComplianceDashboard
,
{
props
:
{
props
:
{
mergeRequests
:
JSON
.
parse
(
mergeRequests
),
mergeRequests
:
JSON
.
parse
(
mergeRequests
),
...
...
ee/app/assets/javascripts/dependencies/components/dependencies_actions.vue
View file @
96ed4677
...
@@ -19,7 +19,7 @@ export default {
...
@@ -19,7 +19,7 @@ export default {
namespace
:
{
namespace
:
{
type
:
String
,
type
:
String
,
required
:
true
,
required
:
true
,
validator
:
value
=>
validator
:
(
value
)
=>
Object
.
values
(
DEPENDENCY_LIST_TYPES
).
some
(({
namespace
})
=>
value
===
namespace
),
Object
.
values
(
DEPENDENCY_LIST_TYPES
).
some
(({
namespace
})
=>
value
===
namespace
),
},
},
},
},
...
...
ee/app/assets/javascripts/dependencies/components/paginated_dependencies_table.vue
View file @
96ed4677
...
@@ -14,7 +14,7 @@ export default {
...
@@ -14,7 +14,7 @@ export default {
namespace
:
{
namespace
:
{
type
:
String
,
type
:
String
,
required
:
true
,
required
:
true
,
validator
:
value
=>
validator
:
(
value
)
=>
Object
.
values
(
DEPENDENCY_LIST_TYPES
).
some
(({
namespace
})
=>
value
===
namespace
),
Object
.
values
(
DEPENDENCY_LIST_TYPES
).
some
(({
namespace
})
=>
value
===
namespace
),
},
},
},
},
...
...
ee/app/assets/javascripts/dependencies/store/getters.js
View file @
96ed4677
...
@@ -10,7 +10,7 @@ export const isIncomplete = ({ currentList }, getters) => getters[`${currentList
...
@@ -10,7 +10,7 @@ export const isIncomplete = ({ currentList }, getters) => getters[`${currentList
export
const
hasNoDependencies
=
({
currentList
},
getters
)
=>
export
const
hasNoDependencies
=
({
currentList
},
getters
)
=>
getters
[
`
${
currentList
}
/hasNoDependencies`
];
getters
[
`
${
currentList
}
/hasNoDependencies`
];
export
const
totals
=
state
=>
export
const
totals
=
(
state
)
=>
state
.
listTypes
.
reduce
(
state
.
listTypes
.
reduce
(
(
acc
,
{
namespace
})
=>
({
(
acc
,
{
namespace
})
=>
({
...
acc
,
...
acc
,
...
...
ee/app/assets/javascripts/dependencies/store/modules/list/actions.js
View file @
96ed4677
...
@@ -41,14 +41,14 @@ export const fetchDependencies = ({ state, dispatch }, params = {}) => {
...
@@ -41,14 +41,14 @@ export const fetchDependencies = ({ state, dispatch }, params = {}) => {
...
params
,
...
params
,
},
},
})
})
.
then
(
response
=>
{
.
then
(
(
response
)
=>
{
if
(
isValidResponse
(
response
))
{
if
(
isValidResponse
(
response
))
{
dispatch
(
'
receiveDependenciesSuccess
'
,
response
);
dispatch
(
'
receiveDependenciesSuccess
'
,
response
);
}
else
{
}
else
{
throw
new
Error
(
__
(
'
Invalid server response
'
));
throw
new
Error
(
__
(
'
Invalid server response
'
));
}
}
})
})
.
catch
(
error
=>
{
.
catch
(
(
error
)
=>
{
dispatch
(
'
receiveDependenciesError
'
,
error
);
dispatch
(
'
receiveDependenciesError
'
,
error
);
createFlash
(
FETCH_ERROR_MESSAGE
);
createFlash
(
FETCH_ERROR_MESSAGE
);
});
});
...
...
ee/app/assets/javascripts/diffs/mixins/image_diff.js
View file @
96ed4677
...
@@ -3,7 +3,7 @@ import { mapActions } from 'vuex';
...
@@ -3,7 +3,7 @@ import { mapActions } from 'vuex';
export
default
{
export
default
{
computed
:
{
computed
:
{
diffFileDiscussions
()
{
diffFileDiscussions
()
{
return
this
.
allDiscussions
.
filter
(
d
=>
!
d
.
isDraft
);
return
this
.
allDiscussions
.
filter
(
(
d
)
=>
!
d
.
isDraft
);
},
},
},
},
methods
:
{
methods
:
{
...
...
ee/app/assets/javascripts/droplab/plugins/custom_number.js
View file @
96ed4677
...
@@ -10,7 +10,7 @@ const CustomNumber = {
...
@@ -10,7 +10,7 @@ const CustomNumber = {
const
isValidNumber
=
!
Number
.
isNaN
(
parsedValue
)
&&
value
!==
''
;
const
isValidNumber
=
!
Number
.
isNaN
(
parsedValue
)
&&
value
!==
''
;
const
customOption
=
[{
id
:
parsedValue
,
title
:
parsedValue
}];
const
customOption
=
[{
id
:
parsedValue
,
title
:
parsedValue
}];
const
defaultDropdownOptions
=
defaultOptions
.
map
(
o
=>
({
id
:
o
,
title
:
o
}));
const
defaultDropdownOptions
=
defaultOptions
.
map
(
(
o
)
=>
({
id
:
o
,
title
:
o
}));
list
.
setData
(
isValidNumber
?
customOption
:
defaultDropdownOptions
);
list
.
setData
(
isValidNumber
?
customOption
:
defaultDropdownOptions
);
list
.
currentIndex
=
0
;
list
.
currentIndex
=
0
;
...
...
ee/app/assets/javascripts/ee_trial_banner/ee_trial_banner.js
View file @
96ed4677
...
@@ -14,7 +14,7 @@ export default class EETrialBanner {
...
@@ -14,7 +14,7 @@ export default class EETrialBanner {
init
()
{
init
()
{
// Wait for navbars to render before querying
// Wait for navbars to render before querying
this
.
setCookies
();
this
.
setCookies
();
this
.
$trialBanner
.
on
(
'
close.bs.alert
'
,
e
=>
this
.
handleTrialBannerDismiss
(
e
));
this
.
$trialBanner
.
on
(
'
close.bs.alert
'
,
(
e
)
=>
this
.
handleTrialBannerDismiss
(
e
));
}
}
/**
/**
...
...
ee/app/assets/javascripts/environments/stores/environments_store.js
View file @
96ed4677
...
@@ -24,7 +24,7 @@ export default class EnvironmentsStore extends CeEnvironmentsStore {
...
@@ -24,7 +24,7 @@ export default class EnvironmentsStore extends CeEnvironmentsStore {
toggleDeployBoard
(
environmentID
)
{
toggleDeployBoard
(
environmentID
)
{
const
environments
=
this
.
state
.
environments
.
slice
();
const
environments
=
this
.
state
.
environments
.
slice
();
this
.
state
.
environments
=
environments
.
map
(
env
=>
{
this
.
state
.
environments
=
environments
.
map
(
(
env
)
=>
{
let
updated
=
{
...
env
};
let
updated
=
{
...
env
};
if
(
env
.
id
===
environmentID
)
{
if
(
env
.
id
===
environmentID
)
{
...
...
ee/app/assets/javascripts/epic/components/epic_form.vue
View file @
96ed4677
...
@@ -46,7 +46,7 @@ export default {
...
@@ -46,7 +46,7 @@ export default {
},
},
computed
:
{
computed
:
{
labelIds
()
{
labelIds
()
{
return
this
.
labels
.
map
(
label
=>
label
.
id
);
return
this
.
labels
.
map
(
(
label
)
=>
label
.
id
);
},
},
},
},
i18n
:
{
i18n
:
{
...
@@ -102,7 +102,7 @@ export default {
...
@@ -102,7 +102,7 @@ export default {
const
ids
=
[];
const
ids
=
[];
const
allLabels
=
[...
labels
,
...
this
.
labels
];
const
allLabels
=
[...
labels
,
...
this
.
labels
];
this
.
labels
=
allLabels
.
filter
(
label
=>
{
this
.
labels
=
allLabels
.
filter
(
(
label
)
=>
{
const
exists
=
ids
.
includes
(
label
.
id
);
const
exists
=
ids
.
includes
(
label
.
id
);
ids
.
push
(
label
.
id
);
ids
.
push
(
label
.
id
);
...
...
ee/app/assets/javascripts/epic/components/sidebar_items/sidebar_labels.vue
View file @
96ed4677
...
@@ -84,7 +84,7 @@ export default {
...
@@ -84,7 +84,7 @@ export default {
if
(
label
.
isAny
)
{
if
(
label
.
isAny
)
{
this
.
epicContext
.
labels
=
[];
this
.
epicContext
.
labels
=
[];
}
else
{
}
else
{
const
labelIndex
=
this
.
epicContext
.
labels
.
findIndex
(
l
=>
l
.
id
===
label
.
id
);
const
labelIndex
=
this
.
epicContext
.
labels
.
findIndex
(
(
l
)
=>
l
.
id
===
label
.
id
);
if
(
labelIndex
===
-
1
)
{
if
(
labelIndex
===
-
1
)
{
this
.
epicContext
.
labels
.
push
(
this
.
epicContext
.
labels
.
push
(
...
@@ -109,9 +109,9 @@ export default {
...
@@ -109,9 +109,9 @@ export default {
// either selected or removed aren't leading to same selection
// either selected or removed aren't leading to same selection
// as current one, as then we don't want to make network call
// as current one, as then we don't want to make network call
// since nothing has changed.
// since nothing has changed.
const
anyLabelUpdated
=
labels
.
some
(
label
=>
{
const
anyLabelUpdated
=
labels
.
some
(
(
label
)
=>
{
// Find this label in existing selection.
// Find this label in existing selection.
const
existingLabel
=
this
.
epicContext
.
labels
.
find
(
l
=>
l
.
id
===
label
.
id
);
const
existingLabel
=
this
.
epicContext
.
labels
.
find
(
(
l
)
=>
l
.
id
===
label
.
id
);
// Check either of the two following conditions;
// Check either of the two following conditions;
// 1. A label that's not currently applied is being applied.
// 1. A label that's not currently applied is being applied.
...
...
ee/app/assets/javascripts/epic/epic_bundle.js
View file @
96ed4677
...
@@ -34,7 +34,7 @@ export default (epicCreate = false) => {
...
@@ -34,7 +34,7 @@ export default (epicCreate = false) => {
methods
:
{
methods
:
{
...
mapActions
([
'
setEpicMeta
'
]),
...
mapActions
([
'
setEpicMeta
'
]),
},
},
render
:
createElement
=>
render
:
(
createElement
)
=>
createElement
(
'
epic-create-app
'
,
{
createElement
(
'
epic-create-app
'
,
{
props
:
{
props
:
{
alignRight
:
el
.
dataset
.
alignRight
,
alignRight
:
el
.
dataset
.
alignRight
,
...
@@ -66,6 +66,6 @@ export default (epicCreate = false) => {
...
@@ -66,6 +66,6 @@ export default (epicCreate = false) => {
methods
:
{
methods
:
{
...
mapActions
([
'
setEpicMeta
'
,
'
setEpicData
'
]),
...
mapActions
([
'
setEpicMeta
'
,
'
setEpicData
'
]),
},
},
render
:
createElement
=>
createElement
(
'
epic-app
'
),
render
:
(
createElement
)
=>
createElement
(
'
epic-app
'
),
});
});
};
};
ee/app/assets/javascripts/epic/epic_tabs.js
View file @
96ed4677
...
@@ -29,7 +29,7 @@ export default class EpicTabs {
...
@@ -29,7 +29,7 @@ export default class EpicTabs {
*/
*/
loadRoadmapBundle
()
{
loadRoadmapBundle
()
{
import
(
'
ee/roadmap/roadmap_bundle
'
)
import
(
'
ee/roadmap/roadmap_bundle
'
)
.
then
(
roadmapBundle
=>
{
.
then
(
(
roadmapBundle
)
=>
{
this
.
initRoadmap
=
roadmapBundle
.
default
;
this
.
initRoadmap
=
roadmapBundle
.
default
;
})
})
.
catch
(()
=>
{});
.
catch
(()
=>
{});
...
...
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