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
d46581c1
Commit
d46581c1
authored
Dec 23, 2020
by
Lukas Eipert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Run prettier on 31 files - 33 of 73
Part of our prettier migration; changing the arrow-parens style.
parent
ef02363c
Changes
32
Hide whitespace changes
Inline
Side-by-side
Showing
32 changed files
with
75 additions
and
108 deletions
+75
-108
.prettierignore
.prettierignore
+0
-33
config/plugins/monaco_webpack.js
config/plugins/monaco_webpack.js
+1
-1
config/webpack.config.js
config/webpack.config.js
+8
-8
ee/app/assets/javascripts/add_gitlab_slack_application/components/add_gitlab_slack_application.vue
...k_application/components/add_gitlab_slack_application.vue
+1
-1
ee/app/assets/javascripts/admin/dev_ops_report/components/devops_adoption_app.vue
...s/admin/dev_ops_report/components/devops_adoption_app.vue
+2
-2
ee/app/assets/javascripts/admin/dev_ops_report/components/devops_adoption_segment_modal.vue
...v_ops_report/components/devops_adoption_segment_modal.vue
+1
-1
ee/app/assets/javascripts/admin/dev_ops_report/components/devops_adoption_table.vue
...admin/dev_ops_report/components/devops_adoption_table.vue
+1
-1
ee/app/assets/javascripts/admin/dev_ops_report/graphql.js
ee/app/assets/javascripts/admin/dev_ops_report/graphql.js
+1
-1
ee/app/assets/javascripts/admin/dev_ops_report/utils/cache_updates.js
...s/javascripts/admin/dev_ops_report/utils/cache_updates.js
+2
-2
ee/app/assets/javascripts/analytics/code_review_analytics/components/app.vue
...cripts/analytics/code_review_analytics/components/app.vue
+3
-3
ee/app/assets/javascripts/analytics/code_review_analytics/components/filter_bar.vue
...analytics/code_review_analytics/components/filter_bar.vue
+4
-4
ee/app/assets/javascripts/analytics/code_review_analytics/filtered_search_code_review_analytics.js
...review_analytics/filtered_search_code_review_analytics.js
+1
-1
ee/app/assets/javascripts/analytics/code_review_analytics/store/modules/merge_requests/actions.js
..._review_analytics/store/modules/merge_requests/actions.js
+1
-1
ee/app/assets/javascripts/analytics/code_review_analytics/utils.js
...sets/javascripts/analytics/code_review_analytics/utils.js
+3
-3
ee/app/assets/javascripts/analytics/contribution_analytics/components/column_chart.vue
...lytics/contribution_analytics/components/column_chart.vue
+2
-2
ee/app/assets/javascripts/analytics/contribution_analytics/contribution_analytics_bundle.js
...s/contribution_analytics/contribution_analytics_bundle.js
+4
-4
ee/app/assets/javascripts/analytics/cycle_analytics/components/create_value_stream_form/utils.js
...le_analytics/components/create_value_stream_form/utils.js
+2
-2
ee/app/assets/javascripts/analytics/cycle_analytics/components/custom_stage_form.vue
...nalytics/cycle_analytics/components/custom_stage_form.vue
+2
-2
ee/app/assets/javascripts/analytics/cycle_analytics/components/filter_bar.vue
...ripts/analytics/cycle_analytics/components/filter_bar.vue
+8
-8
ee/app/assets/javascripts/analytics/cycle_analytics/components/stage_dropdown_filter.vue
...tics/cycle_analytics/components/stage_dropdown_filter.vue
+1
-1
ee/app/assets/javascripts/analytics/cycle_analytics/components/stage_table_nav.vue
.../analytics/cycle_analytics/components/stage_table_nav.vue
+1
-1
ee/app/assets/javascripts/analytics/cycle_analytics/components/tasks_by_type/tasks_by_type_filters.vue
...lytics/components/tasks_by_type/tasks_by_type_filters.vue
+1
-1
ee/app/assets/javascripts/analytics/cycle_analytics/components/time_metrics_card.vue
...nalytics/cycle_analytics/components/time_metrics_card.vue
+1
-1
ee/app/assets/javascripts/analytics/cycle_analytics/index.js
ee/app/assets/javascripts/analytics/cycle_analytics/index.js
+1
-1
ee/app/assets/javascripts/analytics/cycle_analytics/store/actions.js
...ts/javascripts/analytics/cycle_analytics/store/actions.js
+10
-10
ee/app/assets/javascripts/analytics/cycle_analytics/store/getters.js
...ts/javascripts/analytics/cycle_analytics/store/getters.js
+2
-2
ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/custom_stages/actions.js
...cs/cycle_analytics/store/modules/custom_stages/actions.js
+1
-1
ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/custom_stages/mutations.js
.../cycle_analytics/store/modules/custom_stages/mutations.js
+1
-1
ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/duration_chart/actions.js
...s/cycle_analytics/store/modules/duration_chart/actions.js
+5
-5
ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/duration_chart/getters.js
...s/cycle_analytics/store/modules/duration_chart/getters.js
+1
-1
ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/type_of_work/actions.js
...ics/cycle_analytics/store/modules/type_of_work/actions.js
+2
-2
ee/app/assets/javascripts/analytics/cycle_analytics/store/mutations.js
.../javascripts/analytics/cycle_analytics/store/mutations.js
+1
-1
No files found.
.prettierignore
View file @
d46581c1
...
...
@@ -848,39 +848,6 @@ app/assets/javascripts/snippets/components/snippet_blob_view.vue
app/assets/javascripts/snippets/components/snippet_header.vue
app/assets/javascripts/snippets/mixins/snippets.js
## frosty-kare
config/plugins/monaco_webpack.js
config/webpack.config.js
ee/app/assets/javascripts/add_gitlab_slack_application/components/add_gitlab_slack_application.vue
ee/app/assets/javascripts/admin/dev_ops_report/components/devops_adoption_app.vue
ee/app/assets/javascripts/admin/dev_ops_report/components/devops_adoption_segment_modal.vue
ee/app/assets/javascripts/admin/dev_ops_report/components/devops_adoption_table.vue
ee/app/assets/javascripts/admin/dev_ops_report/graphql.js
ee/app/assets/javascripts/admin/dev_ops_report/utils/cache_updates.js
ee/app/assets/javascripts/analytics/code_review_analytics/components/app.vue
ee/app/assets/javascripts/analytics/code_review_analytics/components/filter_bar.vue
ee/app/assets/javascripts/analytics/code_review_analytics/filtered_search_code_review_analytics.js
ee/app/assets/javascripts/analytics/code_review_analytics/store/modules/merge_requests/actions.js
ee/app/assets/javascripts/analytics/code_review_analytics/utils.js
ee/app/assets/javascripts/analytics/contribution_analytics/components/column_chart.vue
ee/app/assets/javascripts/analytics/contribution_analytics/contribution_analytics_bundle.js
ee/app/assets/javascripts/analytics/cycle_analytics/components/create_value_stream_form/utils.js
ee/app/assets/javascripts/analytics/cycle_analytics/components/custom_stage_form.vue
ee/app/assets/javascripts/analytics/cycle_analytics/components/filter_bar.vue
ee/app/assets/javascripts/analytics/cycle_analytics/components/stage_dropdown_filter.vue
ee/app/assets/javascripts/analytics/cycle_analytics/components/stage_table_nav.vue
ee/app/assets/javascripts/analytics/cycle_analytics/components/tasks_by_type/tasks_by_type_filters.vue
ee/app/assets/javascripts/analytics/cycle_analytics/components/time_metrics_card.vue
ee/app/assets/javascripts/analytics/cycle_analytics/index.js
ee/app/assets/javascripts/analytics/cycle_analytics/store/actions.js
ee/app/assets/javascripts/analytics/cycle_analytics/store/getters.js
ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/custom_stages/actions.js
ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/custom_stages/mutations.js
ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/duration_chart/actions.js
ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/duration_chart/getters.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
## frosty-sammet
ee/app/assets/javascripts/analytics/group_ci_cd_analytics/index.js
ee/app/assets/javascripts/analytics/merge_request_analytics/components/filter_bar.vue
...
...
config/plugins/monaco_webpack.js
View file @
d46581c1
...
...
@@ -6,7 +6,7 @@ const { languagesArr } = require('monaco-editor-webpack-plugin/out/languages');
// a known issue in the library and this workaround was suggested here:
// https://github.com/pengx17/monaco-yaml/issues/20
const
yamlLang
=
languagesArr
.
find
(
t
=>
t
.
label
===
'
yaml
'
);
const
yamlLang
=
languagesArr
.
find
(
(
t
)
=>
t
.
label
===
'
yaml
'
);
yamlLang
.
entry
=
[
yamlLang
.
entry
,
'
../../monaco-yaml/lib/esm/monaco.contribution
'
];
yamlLang
.
worker
=
{
...
...
config/webpack.config.js
View file @
d46581c1
...
...
@@ -63,13 +63,13 @@ function generateEntries() {
autoEntriesMap
[
chunkName
]
=
`
${
prefix
}
/
${
path
}
`
;
}
pageEntries
.
forEach
(
path
=>
generateAutoEntries
(
path
));
pageEntries
.
forEach
(
(
path
)
=>
generateAutoEntries
(
path
));
if
(
IS_EE
)
{
const
eePageEntries
=
glob
.
sync
(
'
pages/**/index.js
'
,
{
cwd
:
path
.
join
(
ROOT_PATH
,
'
ee/app/assets/javascripts
'
),
});
eePageEntries
.
forEach
(
path
=>
generateAutoEntries
(
path
,
'
ee
'
));
eePageEntries
.
forEach
(
(
path
)
=>
generateAutoEntries
(
path
,
'
ee
'
));
watchAutoEntries
.
push
(
path
.
join
(
ROOT_PATH
,
'
ee/app/assets/javascripts/pages/
'
));
}
...
...
@@ -77,7 +77,7 @@ function generateEntries() {
autoEntriesCount
=
autoEntryKeys
.
length
;
// import ancestor entrypoints within their children
autoEntryKeys
.
forEach
(
entry
=>
{
autoEntryKeys
.
forEach
(
(
entry
)
=>
{
const
entryPaths
=
[
autoEntriesMap
[
entry
]];
const
segments
=
entry
.
split
(
'
.
'
);
while
(
segments
.
pop
())
{
...
...
@@ -188,7 +188,7 @@ module.exports = {
},
{
test
:
/
\.
js$/
,
exclude
:
path
=>
exclude
:
(
path
)
=>
/node_modules
\/(?!
tributejs
)
|node_modules|vendor
[\\/]
assets/
.
test
(
path
)
&&
!
/
\.
vue
\.
js/
.
test
(
path
),
loader
:
'
babel-loader
'
,
...
...
@@ -448,7 +448,7 @@ module.exports = {
]),
!
IS_EE
&&
new
webpack
.
NormalModuleReplacementPlugin
(
/^ee_component
\/(
.*
)\.
vue/
,
resource
=>
{
new
webpack
.
NormalModuleReplacementPlugin
(
/^ee_component
\/(
.*
)\.
vue/
,
(
resource
)
=>
{
resource
.
request
=
path
.
join
(
ROOT_PATH
,
'
app/assets/javascripts/vue_shared/components/empty_component.js
'
,
...
...
@@ -485,14 +485,14 @@ module.exports = {
const
missingDeps
=
Array
.
from
(
compilation
.
missingDependencies
);
const
nodeModulesPath
=
path
.
join
(
ROOT_PATH
,
'
node_modules
'
);
const
hasMissingNodeModules
=
missingDeps
.
some
(
file
=>
file
.
indexOf
(
nodeModulesPath
)
!==
-
1
,
(
file
)
=>
file
.
indexOf
(
nodeModulesPath
)
!==
-
1
,
);
// watch for changes to missing node_modules
if
(
hasMissingNodeModules
)
compilation
.
contextDependencies
.
add
(
nodeModulesPath
);
// watch for changes to automatic entrypoints
watchAutoEntries
.
forEach
(
watchPath
=>
compilation
.
contextDependencies
.
add
(
watchPath
));
watchAutoEntries
.
forEach
(
(
watchPath
)
=>
compilation
.
contextDependencies
.
add
(
watchPath
));
// report our auto-generated bundle count
console
.
log
(
...
...
@@ -518,7 +518,7 @@ module.exports = {
);
}
const
memoryUsage
=
process
.
memoryUsage
().
heapUsed
;
const
toMB
=
bytes
=>
Math
.
floor
(
bytes
/
1024
/
1024
);
const
toMB
=
(
bytes
)
=>
Math
.
floor
(
bytes
/
1024
/
1024
);
console
.
log
(
`Webpack heap size:
${
toMB
(
memoryUsage
)}
MB`
);
...
...
ee/app/assets/javascripts/add_gitlab_slack_application/components/add_gitlab_slack_application.vue
View file @
d46581c1
...
...
@@ -76,7 +76,7 @@ export default {
addToSlack
()
{
GitlabSlackService
.
addToSlack
(
this
.
slackLinkPath
,
this
.
selectedProjectId
)
.
then
(
response
=>
redirectTo
(
response
.
data
.
add_to_slack_link
))
.
then
(
(
response
)
=>
redirectTo
(
response
.
data
.
add_to_slack_link
))
.
catch
(()
=>
Flash
(
__
(
'
Unable to build Slack link.
'
)));
},
},
...
...
ee/app/assets/javascripts/admin/dev_ops_report/components/devops_adoption_app.vue
View file @
d46581c1
...
...
@@ -74,7 +74,7 @@ export default {
return
Boolean
(
this
.
devopsAdoptionSegments
?.
nodes
?.
length
);
},
hasLoadingError
()
{
return
Object
.
values
(
this
.
errors
).
some
(
error
=>
error
===
true
);
return
Object
.
values
(
this
.
errors
).
some
(
(
error
)
=>
error
===
true
);
},
timestamp
()
{
return
dateformat
(
...
...
@@ -128,7 +128,7 @@ export default {
this
.
isLoadingGroups
=
false
;
}
})
.
catch
(
error
=>
this
.
handleError
(
DEVOPS_ADOPTION_ERROR_KEYS
.
groups
,
error
));
.
catch
(
(
error
)
=>
this
.
handleError
(
DEVOPS_ADOPTION_ERROR_KEYS
.
groups
,
error
));
},
setSelectedSegment
(
segment
)
{
this
.
selectedSegment
=
segment
;
...
...
ee/app/assets/javascripts/admin/dev_ops_report/components/devops_adoption_segment_modal.vue
View file @
d46581c1
...
...
@@ -83,7 +83,7 @@ export default {
},
filteredOptions
()
{
return
this
.
filter
?
this
.
checkboxOptions
.
filter
(
option
=>
?
this
.
checkboxOptions
.
filter
(
(
option
)
=>
option
.
label
.
toLowerCase
().
includes
(
this
.
filter
.
toLowerCase
()),
)
:
this
.
checkboxOptions
;
...
...
ee/app/assets/javascripts/admin/dev_ops_report/components/devops_adoption_table.vue
View file @
d46581c1
...
...
@@ -32,7 +32,7 @@ const headers = [
'
pipelineSucceeded
'
,
'
deploySucceeded
'
,
'
securityScanSucceeded
'
,
].
map
(
key
=>
({
key
,
...
i18n
.
headers
[
key
],
...
fieldOptions
}));
].
map
(
(
key
)
=>
({
key
,
...
i18n
.
headers
[
key
],
...
fieldOptions
}));
export
default
{
name
:
'
DevopsAdoptionTable
'
,
...
...
ee/app/assets/javascripts/admin/dev_ops_report/graphql.js
View file @
d46581c1
...
...
@@ -26,7 +26,7 @@ export const resolvers = {
// eslint-disable-next-line @gitlab/require-i18n-strings
__typename
:
'
Groups
'
,
// eslint-disable-next-line @gitlab/require-i18n-strings
nodes
:
data
.
map
(
group
=>
({
...
group
,
__typename
:
'
Group
'
})),
nodes
:
data
.
map
(
(
group
)
=>
({
...
group
,
__typename
:
'
Group
'
})),
pageInfo
,
};
...
...
ee/app/assets/javascripts/admin/dev_ops_report/utils/cache_updates.js
View file @
d46581c1
...
...
@@ -6,7 +6,7 @@ export const addSegmentToCache = (store, segment) => {
query
:
devopsAdoptionSegmentsQuery
,
});
const
data
=
produce
(
sourceData
,
draftData
=>
{
const
data
=
produce
(
sourceData
,
(
draftData
)
=>
{
// eslint-disable-next-line no-param-reassign
draftData
.
devopsAdoptionSegments
.
nodes
=
[...
draftData
.
devopsAdoptionSegments
.
nodes
,
segment
];
});
...
...
@@ -22,7 +22,7 @@ export const deleteSegmentFromCache = (store, segmentId) => {
query
:
devopsAdoptionSegmentsQuery
,
});
const
updatedData
=
produce
(
sourceData
,
draftData
=>
{
const
updatedData
=
produce
(
sourceData
,
(
draftData
)
=>
{
// eslint-disable-next-line no-param-reassign
draftData
.
devopsAdoptionSegments
.
nodes
=
draftData
.
devopsAdoptionSegments
.
nodes
.
filter
(
({
id
})
=>
id
!==
segmentId
,
...
...
ee/app/assets/javascripts/analytics/code_review_analytics/components/app.vue
View file @
d46581c1
...
...
@@ -34,9 +34,9 @@ export default {
computed
:
{
...
mapState
(
'
mergeRequests
'
,
{
isLoading
:
'
isLoading
'
,
perPage
:
state
=>
state
.
pageInfo
.
perPage
,
totalItems
:
state
=>
state
.
pageInfo
.
total
,
page
:
state
=>
state
.
pageInfo
.
page
,
perPage
:
(
state
)
=>
state
.
pageInfo
.
perPage
,
totalItems
:
(
state
)
=>
state
.
pageInfo
.
total
,
page
:
(
state
)
=>
state
.
pageInfo
.
page
,
}),
currentPage
:
{
get
()
{
...
...
ee/app/assets/javascripts/analytics/code_review_analytics/components/filter_bar.vue
View file @
d46581c1
...
...
@@ -28,10 +28,10 @@ export default {
},
computed
:
{
...
mapState
(
'
filters
'
,
{
selectedMilestone
:
state
=>
state
.
milestones
.
selected
,
selectedLabelList
:
state
=>
state
.
labels
.
selectedList
,
milestonesData
:
state
=>
state
.
milestones
.
data
,
labelsData
:
state
=>
state
.
labels
.
data
,
selectedMilestone
:
(
state
)
=>
state
.
milestones
.
selected
,
selectedLabelList
:
(
state
)
=>
state
.
labels
.
selectedList
,
milestonesData
:
(
state
)
=>
state
.
milestones
.
data
,
labelsData
:
(
state
)
=>
state
.
labels
.
data
,
}),
tokens
()
{
return
[
...
...
ee/app/assets/javascripts/analytics/code_review_analytics/filtered_search_code_review_analytics.js
View file @
d46581c1
...
...
@@ -23,7 +23,7 @@ export default class FilteredSearchCodeReviewAnalytics extends FilteredSearchMan
/**
* Updates filters in code review analytics store
*/
updateObject
=
path
=>
{
updateObject
=
(
path
)
=>
{
const
filters
=
urlParamsToObject
(
path
);
const
{
selectedLabels
:
selectedLabelList
,
selectedMilestone
}
=
transformFilters
(
filters
);
...
...
ee/app/assets/javascripts/analytics/code_review_analytics/store/modules/merge_requests/actions.js
View file @
d46581c1
...
...
@@ -29,7 +29,7 @@ export const fetchMergeRequests = ({ commit, state, rootState }) => {
};
return
API
.
codeReviewAnalytics
(
params
)
.
then
(
response
=>
{
.
then
(
(
response
)
=>
{
const
{
headers
,
data
}
=
response
;
const
normalizedHeaders
=
normalizeHeaders
(
headers
);
commit
(
types
.
RECEIVE_MERGE_REQUESTS_SUCCESS
,
{
...
...
ee/app/assets/javascripts/analytics/code_review_analytics/utils.js
View file @
d46581c1
...
...
@@ -9,7 +9,7 @@
* @param {Object} filters
* @returns {Object}
*/
const
transformFilters
=
filters
=>
{
const
transformFilters
=
(
filters
)
=>
{
const
{
label_name
:
labelNames
,
milestone_title
:
milestoneTitle
,
...
...
@@ -17,13 +17,13 @@ const transformFilters = filters => {
'
not[milestone_title]
'
:
notMilestoneTitle
,
}
=
filters
;
let
selectedLabels
=
labelNames
?.
map
(
label
=>
({
value
:
label
,
operator
:
'
=
'
}))
||
[];
let
selectedLabels
=
labelNames
?.
map
(
(
label
)
=>
({
value
:
label
,
operator
:
'
=
'
}))
||
[];
let
selectedMilestone
=
null
;
if
(
notLabelNames
)
{
selectedLabels
=
[
...
selectedLabels
,
...
notLabelNames
.
map
(
label
=>
({
value
:
label
,
operator
:
'
!=
'
})),
...
notLabelNames
.
map
(
(
label
)
=>
({
value
:
label
,
operator
:
'
!=
'
})),
];
}
...
...
ee/app/assets/javascripts/analytics/contribution_analytics/components/column_chart.vue
View file @
d46581c1
...
...
@@ -71,12 +71,12 @@ export default {
methods
:
{
setSvg
(
name
)
{
return
getSvgIconPathContent
(
name
)
.
then
(
path
=>
{
.
then
(
(
path
)
=>
{
if
(
path
)
{
this
.
$set
(
this
.
svgs
,
name
,
`path://
${
path
}
`
);
}
})
.
catch
(
e
=>
{
.
catch
(
(
e
)
=>
{
// eslint-disable-next-line no-console, @gitlab/require-i18n-strings
console
.
error
(
'
SVG could not be rendered correctly:
'
,
e
);
});
...
...
ee/app/assets/javascripts/analytics/contribution_analytics/contribution_analytics_bundle.js
View file @
d46581c1
...
...
@@ -3,12 +3,12 @@ import { sortBy } from 'lodash';
import
ColumnChart
from
'
./components/column_chart.vue
'
;
import
{
__
}
from
'
~/locale
'
;
const
sortByValue
=
data
=>
sortBy
(
data
,
item
=>
item
[
1
]).
reverse
();
const
sortByValue
=
(
data
)
=>
sortBy
(
data
,
(
item
)
=>
item
[
1
]).
reverse
();
const
allValuesEmpty
=
graphData
=>
const
allValuesEmpty
=
(
graphData
)
=>
graphData
.
reduce
((
acc
,
data
)
=>
acc
+
Math
.
min
(
0
,
data
[
1
]),
0
)
===
0
;
export
default
dataEl
=>
{
export
default
(
dataEl
)
=>
{
if
(
!
dataEl
)
return
;
const
data
=
JSON
.
parse
(
dataEl
.
innerHTML
);
...
...
@@ -23,7 +23,7 @@ export default dataEl => {
merge_requests_created
:
[],
};
outputElIds
.
forEach
(
id
=>
{
outputElIds
.
forEach
(
(
id
)
=>
{
data
[
id
].
data
.
forEach
((
d
,
index
)
=>
{
formattedData
[
id
].
push
([
data
.
labels
[
index
],
d
]);
});
...
...
ee/app/assets/javascripts/analytics/cycle_analytics/components/create_value_stream_form/utils.js
View file @
d46581c1
...
...
@@ -21,7 +21,7 @@ import { DEFAULT_STAGE_NAMES } from '../../constants';
* @param {CustomStageEvents[]} events
* @returns {DropdownData[]} array of start events formatted for dropdowns
*/
export
const
startEventOptions
=
eventsList
=>
[
export
const
startEventOptions
=
(
eventsList
)
=>
[
{
value
:
null
,
text
:
I18N
.
SELECT_START_EVENT
},
...
eventsList
.
filter
(
isStartEvent
).
map
(
eventToOption
),
];
...
...
@@ -82,7 +82,7 @@ export const initializeFormData = ({ fields, errors }) => {
* @param {Object} fields key value pair of form field values
* @returns {Object} key value pair of form fields with an array of errors
*/
export
const
validateFields
=
fields
=>
{
export
const
validateFields
=
(
fields
)
=>
{
const
newErrors
=
{};
if
(
fields
?.
name
)
{
...
...
ee/app/assets/javascripts/analytics/cycle_analytics/components/custom_stage_form.vue
View file @
d46581c1
...
...
@@ -51,7 +51,7 @@ export default {
hasErrors
()
{
return
(
this
.
eventMismatchError
||
Object
.
values
(
this
.
errors
).
some
(
errArray
=>
errArray
?.
length
)
this
.
eventMismatchError
||
Object
.
values
(
this
.
errors
).
some
(
(
errArray
)
=>
errArray
?.
length
)
);
},
startEventRequiresLabel
()
{
...
...
@@ -82,7 +82,7 @@ export default {
requiredFields
.
push
(
endEventLabelId
);
}
return
requiredFields
.
every
(
fieldValue
=>
fieldValue
&&
(
fieldValue
.
length
>
0
||
fieldValue
>
0
),
(
fieldValue
)
=>
fieldValue
&&
(
fieldValue
.
length
>
0
||
fieldValue
>
0
),
);
},
isDirty
()
{
...
...
ee/app/assets/javascripts/analytics/cycle_analytics/components/filter_bar.vue
View file @
d46581c1
...
...
@@ -30,14 +30,14 @@ export default {
},
computed
:
{
...
mapState
(
'
filters
'
,
{
selectedMilestone
:
state
=>
state
.
milestones
.
selected
,
selectedAuthor
:
state
=>
state
.
authors
.
selected
,
selectedLabelList
:
state
=>
state
.
labels
.
selectedList
,
selectedAssigneeList
:
state
=>
state
.
assignees
.
selectedList
,
milestonesData
:
state
=>
state
.
milestones
.
data
,
labelsData
:
state
=>
state
.
labels
.
data
,
authorsData
:
state
=>
state
.
authors
.
data
,
assigneesData
:
state
=>
state
.
assignees
.
data
,
selectedMilestone
:
(
state
)
=>
state
.
milestones
.
selected
,
selectedAuthor
:
(
state
)
=>
state
.
authors
.
selected
,
selectedLabelList
:
(
state
)
=>
state
.
labels
.
selectedList
,
selectedAssigneeList
:
(
state
)
=>
state
.
assignees
.
selectedList
,
milestonesData
:
(
state
)
=>
state
.
milestones
.
data
,
labelsData
:
(
state
)
=>
state
.
labels
.
data
,
authorsData
:
(
state
)
=>
state
.
authors
.
data
,
assigneesData
:
(
state
)
=>
state
.
assignees
.
data
,
}),
tokens
()
{
return
[
...
...
ee/app/assets/javascripts/analytics/cycle_analytics/components/stage_dropdown_filter.vue
View file @
d46581c1
...
...
@@ -49,7 +49,7 @@ export default {
},
onClick
({
stage
,
isMarking
})
{
this
.
selectedStages
=
isMarking
?
this
.
selectedStages
.
filter
(
s
=>
s
.
id
!==
stage
.
id
)
?
this
.
selectedStages
.
filter
(
(
s
)
=>
s
.
id
!==
stage
.
id
)
:
this
.
selectedStages
.
concat
([
stage
]);
this
.
$emit
(
'
selected
'
,
this
.
selectedStages
);
...
...
ee/app/assets/javascripts/analytics/cycle_analytics/components/stage_table_nav.vue
View file @
d46581c1
...
...
@@ -53,7 +53,7 @@ export default {
if
(
this
.
allowCustomOrdering
)
{
const
options
=
{
...
sortableDefaultOptions
(),
onUpdate
:
event
=>
{
onUpdate
:
(
event
)
=>
{
const
el
=
event
.
item
;
const
{
previousElementSibling
,
nextElementSibling
}
=
el
;
...
...
ee/app/assets/javascripts/analytics/cycle_analytics/components/tasks_by_type/tasks_by_type_filters.vue
View file @
d46581c1
...
...
@@ -121,7 +121,7 @@ export default {
:checked=
"subjectFilter"
:options=
"subjectFilterOptions"
@
input=
"
value
=>
(value)
=>
$emit('updateFilter',
{ filter: $options.TASKS_BY_TYPE_FILTERS.SUBJECT, value })
"
/>
...
...
ee/app/assets/javascripts/analytics/cycle_analytics/components/time_metrics_card.vue
View file @
d46581c1
...
...
@@ -35,7 +35,7 @@ export default {
requestType
:
{
type
:
String
,
required
:
true
,
validator
:
t
=>
OVERVIEW_METRICS
[
t
],
validator
:
(
t
)
=>
OVERVIEW_METRICS
[
t
],
},
},
data
()
{
...
...
ee/app/assets/javascripts/analytics/cycle_analytics/index.js
View file @
d46581c1
...
...
@@ -52,7 +52,7 @@ export default () => {
name
:
'
CycleAnalyticsApp
'
,
apolloProvider
,
store
,
render
:
createElement
=>
render
:
(
createElement
)
=>
createElement
(
CycleAnalytics
,
{
props
:
{
emptyStateSvgPath
,
...
...
ee/app/assets/javascripts/analytics/cycle_analytics/store/actions.js
View file @
d46581c1
...
...
@@ -12,7 +12,7 @@ import {
flashErrorIfStatusNotOk
,
}
from
'
../utils
'
;
const
appendExtension
=
path
=>
(
path
.
indexOf
(
'
.
'
)
>
-
1
?
path
:
`
${
path
}
.json`
);
const
appendExtension
=
(
path
)
=>
(
path
.
indexOf
(
'
.
'
)
>
-
1
?
path
:
`
${
path
}
.json`
);
export
const
setPaths
=
({
dispatch
},
options
)
=>
{
const
{
groupPath
,
milestonesPath
=
''
,
labelsPath
=
''
}
=
options
;
...
...
@@ -66,7 +66,7 @@ export const fetchStageData = ({ dispatch, getters }, stageId) => {
})
.
then
(
checkForDataError
)
.
then
(({
data
})
=>
dispatch
(
'
receiveStageDataSuccess
'
,
data
))
.
catch
(
error
=>
dispatch
(
'
receiveStageDataError
'
,
error
));
.
catch
(
(
error
)
=>
dispatch
(
'
receiveStageDataError
'
,
error
));
};
export
const
requestStageMedianValues
=
({
commit
})
=>
commit
(
types
.
REQUEST_STAGE_MEDIANS
);
...
...
@@ -96,11 +96,11 @@ export const fetchStageMedianValues = ({ dispatch, commit, getters }) => {
activeStages
,
currentValueStreamId
,
}
=
getters
;
const
stageIds
=
activeStages
.
map
(
s
=>
s
.
slug
);
const
stageIds
=
activeStages
.
map
(
(
s
)
=>
s
.
slug
);
dispatch
(
'
requestStageMedianValues
'
);
return
Promise
.
all
(
stageIds
.
map
(
stageId
=>
stageIds
.
map
(
(
stageId
)
=>
fetchStageMedian
({
groupId
:
currentGroupPath
,
valueStreamId
:
currentValueStreamId
,
...
...
@@ -109,8 +109,8 @@ export const fetchStageMedianValues = ({ dispatch, commit, getters }) => {
}),
),
)
.
then
(
data
=>
commit
(
types
.
RECEIVE_STAGE_MEDIANS_SUCCESS
,
data
))
.
catch
(
error
=>
dispatch
(
'
receiveStageMedianValuesError
'
,
error
));
.
then
(
(
data
)
=>
commit
(
types
.
RECEIVE_STAGE_MEDIANS_SUCCESS
,
data
))
.
catch
(
(
error
)
=>
dispatch
(
'
receiveStageMedianValuesError
'
,
error
));
};
export
const
requestCycleAnalyticsData
=
({
commit
})
=>
commit
(
types
.
REQUEST_CYCLE_ANALYTICS_DATA
);
...
...
@@ -136,7 +136,7 @@ export const fetchCycleAnalyticsData = ({ dispatch }) => {
.
then
(()
=>
dispatch
(
'
requestCycleAnalyticsData
'
))
.
then
(()
=>
dispatch
(
'
fetchValueStreams
'
))
.
then
(()
=>
dispatch
(
'
receiveCycleAnalyticsDataSuccess
'
))
.
catch
(
error
=>
{
.
catch
(
(
error
)
=>
{
return
Promise
.
all
([
dispatch
(
'
receiveCycleAnalyticsDataError
'
,
error
),
dispatch
(
'
durationChart/setLoading
'
,
false
),
...
...
@@ -193,7 +193,7 @@ export const fetchGroupStagesAndEvents = ({ dispatch, getters }) => {
dispatch
(
'
receiveGroupStagesSuccess
'
,
stages
);
dispatch
(
'
customStages/setStageEvents
'
,
events
);
})
.
catch
(
error
=>
{
.
catch
(
(
error
)
=>
{
throwIfUserForbidden
(
error
);
return
dispatch
(
'
receiveGroupStagesError
'
,
error
);
});
...
...
@@ -267,7 +267,7 @@ export const removeStage = ({ dispatch, getters }, stageId) => {
stageId
,
})
.
then
(()
=>
dispatch
(
'
receiveRemoveStageSuccess
'
))
.
catch
(
error
=>
dispatch
(
'
receiveRemoveStageError
'
,
error
));
.
catch
(
(
error
)
=>
dispatch
(
'
receiveRemoveStageError
'
,
error
));
};
export
const
initializeCycleAnalyticsSuccess
=
({
commit
})
=>
...
...
@@ -400,7 +400,7 @@ export const fetchValueStreams = ({ commit, dispatch, getters, state }) => {
return
Api
.
cycleAnalyticsValueStreams
(
currentGroupPath
)
.
then
(({
data
})
=>
dispatch
(
'
receiveValueStreamsSuccess
'
,
data
))
.
catch
(
error
=>
{
.
catch
(
(
error
)
=>
{
const
{
response
:
{
status
},
}
=
error
;
...
...
ee/app/assets/javascripts/analytics/cycle_analytics/store/getters.js
View file @
d46581c1
...
...
@@ -7,7 +7,7 @@ import { dateFormats } from '../../shared/constants';
import
{
transformStagesForPathNavigation
}
from
'
../utils
'
;
import
{
DEFAULT_VALUE_STREAM_ID
}
from
'
../constants
'
;
export
const
hasNoAccessError
=
state
=>
state
.
errorCode
===
httpStatus
.
FORBIDDEN
;
export
const
hasNoAccessError
=
(
state
)
=>
state
.
errorCode
===
httpStatus
.
FORBIDDEN
;
export
const
currentValueStreamId
=
({
selectedValueStream
})
=>
selectedValueStream
?.
id
||
DEFAULT_VALUE_STREAM_ID
;
...
...
@@ -51,7 +51,7 @@ export const hiddenStages = ({ stages }) => filterStagesByHiddenStatus(stages);
export
const
activeStages
=
({
stages
})
=>
filterStagesByHiddenStatus
(
stages
,
false
);
export
const
enableCustomOrdering
=
({
stages
,
errorSavingStageOrder
})
=>
stages
.
some
(
stage
=>
isNumber
(
stage
.
id
))
&&
!
errorSavingStageOrder
;
stages
.
some
(
(
stage
)
=>
isNumber
(
stage
.
id
))
&&
!
errorSavingStageOrder
;
export
const
customStageFormActive
=
({
isCreatingCustomStage
,
isEditingCustomStage
})
=>
Boolean
(
isCreatingCustomStage
||
isEditingCustomStage
);
...
...
ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/custom_stages/actions.js
View file @
d46581c1
...
...
@@ -76,7 +76,7 @@ export const createStage = ({ dispatch, rootGetters }, data) => {
valueStreamId
:
currentValueStreamId
,
data
,
})
.
then
(
response
=>
{
.
then
(
(
response
)
=>
{
const
{
status
,
data
:
responseData
}
=
response
;
return
dispatch
(
'
receiveCreateStageSuccess
'
,
{
status
,
data
:
responseData
});
})
...
...
ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/custom_stages/mutations.js
View file @
d46581c1
...
...
@@ -25,7 +25,7 @@ const extractFormFields = (rawStage = {}) => {
export
default
{
[
types
.
SET_STAGE_EVENTS
](
state
,
data
=
[])
{
state
.
formEvents
=
data
.
map
(
ev
=>
convertObjectPropsToCamelCase
(
ev
,
{
deep
:
true
}));
state
.
formEvents
=
data
.
map
(
(
ev
)
=>
convertObjectPropsToCamelCase
(
ev
,
{
deep
:
true
}));
},
[
types
.
SET_STAGE_FORM_ERRORS
](
state
,
errors
)
{
state
.
formErrors
=
convertObjectPropsToCamelCase
(
errors
,
{
deep
:
true
});
...
...
ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/duration_chart/actions.js
View file @
d46581c1
...
...
@@ -24,7 +24,7 @@ export const fetchDurationData = ({ dispatch, commit, rootGetters }) => {
currentValueStreamId
,
}
=
rootGetters
;
return
Promise
.
all
(
activeStages
.
map
(
stage
=>
{
activeStages
.
map
(
(
stage
)
=>
{
const
{
slug
}
=
stage
;
return
Api
.
cycleAnalyticsDurationChart
({
...
...
@@ -37,13 +37,13 @@ export const fetchDurationData = ({ dispatch, commit, rootGetters }) => {
.
then
(({
data
})
=>
({
slug
,
selected
:
true
,
data
}));
}),
)
.
then
(
data
=>
commit
(
types
.
RECEIVE_DURATION_DATA_SUCCESS
,
data
))
.
catch
(
error
=>
dispatch
(
'
receiveDurationDataError
'
,
error
));
.
then
(
(
data
)
=>
commit
(
types
.
RECEIVE_DURATION_DATA_SUCCESS
,
data
))
.
catch
(
(
error
)
=>
dispatch
(
'
receiveDurationDataError
'
,
error
));
};
export
const
updateSelectedDurationChartStages
=
({
state
,
commit
},
stages
)
=>
{
const
setSelectedPropertyOnStages
=
data
=>
data
.
map
(
stage
=>
{
const
setSelectedPropertyOnStages
=
(
data
)
=>
data
.
map
(
(
stage
)
=>
{
const
selected
=
stages
.
reduce
((
result
,
object
)
=>
{
if
(
object
.
slug
===
stage
.
slug
)
return
true
;
return
result
;
...
...
ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/duration_chart/getters.js
View file @
d46581c1
...
...
@@ -3,7 +3,7 @@ import { getDurationChartData } from '../../../utils';
export
const
durationChartPlottableData
=
(
state
,
_
,
rootState
)
=>
{
const
{
startDate
,
endDate
}
=
rootState
;
const
{
durationData
}
=
state
;
const
selectedStagesDurationData
=
durationData
.
filter
(
stage
=>
stage
.
selected
);
const
selectedStagesDurationData
=
durationData
.
filter
(
(
stage
)
=>
stage
.
selected
);
const
plottableData
=
getDurationChartData
(
selectedStagesDurationData
,
startDate
,
endDate
);
return
plottableData
.
length
?
plottableData
:
[];
...
...
ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/type_of_work/actions.js
View file @
d46581c1
...
...
@@ -44,7 +44,7 @@ export const fetchTopRankedGroupLabels = ({ dispatch, commit, state, rootGetters
})
.
then
(
checkForDataError
)
.
then
(({
data
})
=>
dispatch
(
'
receiveTopRankedGroupLabelsSuccess
'
,
data
))
.
catch
(
error
=>
{
.
catch
(
(
error
)
=>
{
throwIfUserForbidden
(
error
);
return
dispatch
(
'
receiveTopRankedGroupLabelsError
'
,
error
);
});
...
...
@@ -90,7 +90,7 @@ export const fetchTasksByTypeData = ({ dispatch, commit, state, rootGetters }) =
})
.
then
(
checkForDataError
)
.
then
(({
data
})
=>
commit
(
types
.
RECEIVE_TASKS_BY_TYPE_DATA_SUCCESS
,
data
))
.
catch
(
error
=>
dispatch
(
'
receiveTasksByTypeDataError
'
,
error
));
.
catch
(
(
error
)
=>
dispatch
(
'
receiveTasksByTypeDataError
'
,
error
));
}
return
commit
(
types
.
RECEIVE_TASKS_BY_TYPE_DATA_SUCCESS
,
[]);
};
...
...
ee/app/assets/javascripts/analytics/cycle_analytics/store/mutations.js
View file @
d46581c1
...
...
@@ -33,7 +33,7 @@ export default {
state
.
selectedStageError
=
''
;
},
[
types
.
RECEIVE_STAGE_DATA_SUCCESS
](
state
,
events
=
[])
{
state
.
currentStageEvents
=
events
.
map
(
fields
=>
state
.
currentStageEvents
=
events
.
map
(
(
fields
)
=>
convertObjectPropsToCamelCase
(
fields
,
{
deep
:
true
}),
);
state
.
isEmptyStage
=
!
events
.
length
;
...
...
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