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
2328e10a
Commit
2328e10a
authored
Sep 21, 2017
by
Filipa Lacerda
Committed by
Phil Hughes
Sep 21, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Port of 37220-es-modules to EE
parent
7c627ac8
Changes
45
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
45 changed files
with
941 additions
and
876 deletions
+941
-876
app/assets/javascripts/awards_handler.js
app/assets/javascripts/awards_handler.js
+5
-4
app/assets/javascripts/behaviors/quick_submit.js
app/assets/javascripts/behaviors/quick_submit.js
+2
-1
app/assets/javascripts/blob/viewer/index.js
app/assets/javascripts/blob/viewer/index.js
+3
-1
app/assets/javascripts/boards/boards_bundle.js
app/assets/javascripts/boards/boards_bundle.js
+4
-3
app/assets/javascripts/boards/stores/boards_store.js
app/assets/javascripts/boards/stores/boards_store.js
+2
-1
app/assets/javascripts/build.js
app/assets/javascripts/build.js
+2
-1
app/assets/javascripts/confirm_danger_modal.js
app/assets/javascripts/confirm_danger_modal.js
+2
-1
app/assets/javascripts/copy_as_gfm.js
app/assets/javascripts/copy_as_gfm.js
+3
-3
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+4
-3
app/assets/javascripts/environments/components/environment.vue
...ssets/javascripts/environments/components/environment.vue
+10
-10
app/assets/javascripts/environments/folder/environments_folder_view.vue
...ascripts/environments/folder/environments_folder_view.vue
+9
-9
app/assets/javascripts/environments/stores/environments_store.js
...ets/javascripts/environments/stores/environments_store.js
+3
-3
app/assets/javascripts/groups/components/groups.vue
app/assets/javascripts/groups/components/groups.vue
+3
-2
app/assets/javascripts/groups/groups_filterable_list.js
app/assets/javascripts/groups/groups_filterable_list.js
+2
-1
app/assets/javascripts/groups/index.js
app/assets/javascripts/groups/index.js
+4
-3
app/assets/javascripts/groups/stores/groups_store.js
app/assets/javascripts/groups/stores/groups_store.js
+3
-2
app/assets/javascripts/groups_select.js
app/assets/javascripts/groups_select.js
+2
-1
app/assets/javascripts/issuable/issuable_bundle.js
app/assets/javascripts/issuable/issuable_bundle.js
+2
-1
app/assets/javascripts/lib/utils/common_utils.js
app/assets/javascripts/lib/utils/common_utils.js
+430
-430
app/assets/javascripts/lib/utils/poll.js
app/assets/javascripts/lib/utils/poll.js
+2
-1
app/assets/javascripts/main.js
app/assets/javascripts/main.js
+4
-4
app/assets/javascripts/merge_request_tabs.js
app/assets/javascripts/merge_request_tabs.js
+8
-3
app/assets/javascripts/mirrors/mirror_pull.js
app/assets/javascripts/mirrors/mirror_pull.js
+2
-1
app/assets/javascripts/monitoring/components/dashboard.vue
app/assets/javascripts/monitoring/components/dashboard.vue
+2
-1
app/assets/javascripts/monitoring/services/monitoring_service.js
...ets/javascripts/monitoring/services/monitoring_service.js
+2
-1
app/assets/javascripts/notes.js
app/assets/javascripts/notes.js
+10
-9
app/assets/javascripts/notes/stores/actions.js
app/assets/javascripts/notes/stores/actions.js
+3
-2
app/assets/javascripts/pager.js
app/assets/javascripts/pager.js
+2
-2
app/assets/javascripts/pipeline_schedules/setup_pipeline_variable_list.js
...cripts/pipeline_schedules/setup_pipeline_variable_list.js
+3
-1
app/assets/javascripts/pipelines.js
app/assets/javascripts/pipelines.js
+2
-1
app/assets/javascripts/pipelines/components/pipelines.vue
app/assets/javascripts/pipelines/components/pipelines.vue
+6
-5
app/assets/javascripts/pipelines/stores/pipelines_store.js
app/assets/javascripts/pipelines/stores/pipelines_store.js
+4
-2
app/assets/javascripts/profile/profile.js
app/assets/javascripts/profile/profile.js
+2
-1
app/assets/javascripts/projects/settings_service_desk/service_desk_bundle.js
...pts/projects/settings_service_desk/service_desk_bundle.js
+2
-1
app/assets/javascripts/prometheus_metrics/prometheus_metrics.js
...sets/javascripts/prometheus_metrics/prometheus_metrics.js
+2
-1
app/assets/javascripts/search_autocomplete.js
app/assets/javascripts/search_autocomplete.js
+7
-6
app/assets/javascripts/todos.js
app/assets/javascripts/todos.js
+8
-12
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js
...merge_request_widget/components/mr_widget_memory_usage.js
+2
-2
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
...javascripts/vue_merge_request_widget/mr_widget_options.js
+5
-4
changelogs/unreleased/37220-es-modules.yml
changelogs/unreleased/37220-es-modules.yml
+5
-0
spec/javascripts/environments/folder/environments_folder_view_spec.js
...ipts/environments/folder/environments_folder_view_spec.js
+4
-0
spec/javascripts/lib/utils/common_utils_spec.js
spec/javascripts/lib/utils/common_utils_spec.js
+324
-307
spec/javascripts/merge_request_tabs_spec.js
spec/javascripts/merge_request_tabs_spec.js
+4
-3
spec/javascripts/todos_spec.js
spec/javascripts/todos_spec.js
+11
-18
spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
+20
-8
No files found.
app/assets/javascripts/awards_handler.js
View file @
2328e10a
...
...
@@ -2,6 +2,7 @@
/* global Flash */
import
_
from
'
underscore
'
;
import
Cookies
from
'
js-cookie
'
;
import
{
isInIssuePage
,
updateTooltipTitle
}
from
'
./lib/utils/common_utils
'
;
const
animationEndEventString
=
'
animationend webkitAnimationEnd MSAnimationEnd oAnimationEnd
'
;
const
transitionEndEventString
=
'
transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd
'
;
...
...
@@ -237,7 +238,7 @@ class AwardsHandler {
addAward
(
votesBlock
,
awardUrl
,
emoji
,
checkMutuality
,
callback
)
{
const
isMainAwardsBlock
=
votesBlock
.
closest
(
'
.js-issue-note-awards
'
).
length
;
if
(
gl
.
utils
.
isInIssuePage
()
&&
!
isMainAwardsBlock
)
{
if
(
isInIssuePage
()
&&
!
isMainAwardsBlock
)
{
const
id
=
votesBlock
.
attr
(
'
id
'
).
replace
(
'
note_
'
,
''
);
$
(
'
.emoji-menu
'
).
removeClass
(
'
is-visible
'
);
...
...
@@ -288,7 +289,7 @@ class AwardsHandler {
}
getVotesBlock
()
{
if
(
gl
.
utils
.
isInIssuePage
())
{
if
(
isInIssuePage
())
{
const
$el
=
$
(
'
.js-add-award.is-active
'
).
closest
(
'
.note.timeline-entry
'
);
if
(
$el
.
length
)
{
...
...
@@ -452,11 +453,11 @@ class AwardsHandler {
userAuthored
(
$emojiButton
)
{
const
oldTitle
=
this
.
getAwardTooltip
(
$emojiButton
);
const
newTitle
=
'
You cannot vote on your own issue, MR and note
'
;
gl
.
utils
.
updateTooltipTitle
(
$emojiButton
,
newTitle
).
tooltip
(
'
show
'
);
updateTooltipTitle
(
$emojiButton
,
newTitle
).
tooltip
(
'
show
'
);
// Restore tooltip back to award list
return
setTimeout
(()
=>
{
$emojiButton
.
tooltip
(
'
hide
'
);
gl
.
utils
.
updateTooltipTitle
(
$emojiButton
,
oldTitle
);
updateTooltipTitle
(
$emojiButton
,
oldTitle
);
},
2800
);
}
...
...
app/assets/javascripts/behaviors/quick_submit.js
View file @
2328e10a
import
'
../commons/bootstrap
'
;
import
{
isInIssuePage
}
from
'
../lib/utils/common_utils
'
;
// Quick Submit behavior
//
...
...
@@ -45,7 +46,7 @@ $(document).on('keydown.quick_submit', '.js-quick-submit', (e) => {
if
(
!
$submitButton
.
attr
(
'
disabled
'
))
{
$submitButton
.
trigger
(
'
click
'
,
[
e
]);
if
(
!
gl
.
utils
.
isInIssuePage
())
{
if
(
!
isInIssuePage
())
{
$submitButton
.
disable
();
}
}
...
...
app/assets/javascripts/blob/viewer/index.js
View file @
2328e10a
/* global Flash */
import
{
handleLocationHash
}
from
'
../../lib/utils/common_utils
'
;
export
default
class
BlobViewer
{
constructor
()
{
BlobViewer
.
initAuxiliaryViewer
();
...
...
@@ -114,7 +116,7 @@ export default class BlobViewer {
$
(
viewer
).
renderGFM
();
this
.
$fileHolder
.
trigger
(
'
highlight:line
'
);
gl
.
utils
.
handleLocationHash
();
handleLocationHash
();
this
.
toggleCopyButtonState
();
})
...
...
app/assets/javascripts/boards/boards_bundle.js
View file @
2328e10a
...
...
@@ -24,6 +24,7 @@ import './components/board_sidebar';
import
'
./components/new_list_dropdown
'
;
import
'
./components/modal/index
'
;
import
'
../vue_shared/vue_resource_interceptor
'
;
import
{
convertPermissionToBoolean
}
from
'
../lib/utils/common_utils
'
;
import
'
./components/boards_selector
'
;
import
collapseIcon
from
'
./icons/fullscreen_collapse.svg
'
;
...
...
@@ -153,10 +154,10 @@ $(() => {
modal
:
ModalStore
.
store
,
store
:
Store
.
state
,
isFullscreen
:
false
,
focusModeAvailable
:
gl
.
utils
.
convertPermissionToBoolean
(
focusModeAvailable
:
convertPermissionToBoolean
(
$boardApp
.
dataset
.
focusModeAvailable
,
),
canAdminList
:
this
.
$options
.
el
&&
gl
.
utils
.
convertPermissionToBoolean
(
canAdminList
:
this
.
$options
.
el
&&
convertPermissionToBoolean
(
this
.
$options
.
el
.
dataset
.
canAdminList
,
),
};
...
...
@@ -226,7 +227,7 @@ $(() => {
modal
:
ModalStore
.
store
,
store
:
Store
.
state
,
isFullscreen
:
false
,
focusModeAvailable
:
gl
.
utils
.
convertPermissionToBoolean
(
$boardApp
.
dataset
.
focusModeAvailable
),
focusModeAvailable
:
convertPermissionToBoolean
(
$boardApp
.
dataset
.
focusModeAvailable
),
},
methods
:
{
toggleFocusMode
()
{
...
...
app/assets/javascripts/boards/stores/boards_store.js
View file @
2328e10a
...
...
@@ -3,6 +3,7 @@
import
_
from
'
underscore
'
;
import
Cookies
from
'
js-cookie
'
;
import
boardsStoreEE
from
'
ee/boards/stores/boards_store_ee
'
;
import
{
getUrlParamsArray
}
from
'
../../lib/utils/common_utils
'
;
window
.
gl
=
window
.
gl
||
{};
window
.
gl
.
issueBoards
=
window
.
gl
.
issueBoards
||
{};
...
...
@@ -22,7 +23,7 @@ gl.issueBoards.BoardsStore = {
},
create
()
{
this
.
state
.
lists
=
[];
this
.
filter
.
path
=
g
l
.
utils
.
g
etUrlParamsArray
().
join
(
'
&
'
);
this
.
filter
.
path
=
getUrlParamsArray
().
join
(
'
&
'
);
this
.
detail
=
{
issue
:
{}
};
},
createNewListDropdownData
()
{
...
...
app/assets/javascripts/build.js
View file @
2328e10a
...
...
@@ -3,6 +3,7 @@ consistent-return, prefer-rest-params */
import
_
from
'
underscore
'
;
import
bp
from
'
./breakpoints
'
;
import
{
bytesToKiB
}
from
'
./lib/utils/number_utils
'
;
import
{
setCiStatusFavicon
}
from
'
./lib/utils/common_utils
'
;
window
.
Build
=
(
function
()
{
Build
.
timeout
=
null
;
...
...
@@ -169,7 +170,7 @@ window.Build = (function () {
data
:
this
.
state
,
})
.
done
((
log
)
=>
{
gl
.
utils
.
setCiStatusFavicon
(
`
${
this
.
pageUrl
}
/status.json`
);
setCiStatusFavicon
(
`
${
this
.
pageUrl
}
/status.json`
);
if
(
log
.
state
)
{
this
.
state
=
log
.
state
;
...
...
app/assets/javascripts/confirm_danger_modal.js
View file @
2328e10a
/* eslint-disable func-names, space-before-function-paren, wrap-iife, one-var, no-var, camelcase, one-var-declaration-per-line, no-else-return, max-len */
import
{
rstrip
}
from
'
./lib/utils/common_utils
'
;
window
.
ConfirmDangerModal
=
(
function
()
{
function
ConfirmDangerModal
(
form
,
text
,
arg
)
{
...
...
@@ -16,7 +17,7 @@ window.ConfirmDangerModal = (function() {
submit
.
disable
();
$
(
'
.js-confirm-danger-input
'
).
off
(
'
input
'
);
$
(
'
.js-confirm-danger-input
'
).
on
(
'
input
'
,
function
()
{
if
(
gl
.
utils
.
rstrip
(
$
(
this
).
val
())
===
project_path
)
{
if
(
rstrip
(
$
(
this
).
val
())
===
project_path
)
{
return
submit
.
enable
();
}
else
{
return
submit
.
disable
();
...
...
app/assets/javascripts/copy_as_gfm.js
View file @
2328e10a
/* eslint-disable class-methods-use-this, object-shorthand, no-unused-vars, no-use-before-define, no-new, max-len, no-restricted-syntax, guard-for-in, no-continue */
import
_
from
'
underscore
'
;
import
'
./lib/utils/common_utils
'
;
import
{
insertText
,
getSelectedFragment
,
nodeMatchesSelector
}
from
'
./lib/utils/common_utils
'
;
import
{
placeholderImage
}
from
'
./lazy_loader
'
;
const
gfmRules
=
{
...
...
@@ -295,7 +295,7 @@ class CopyAsGFM {
const
clipboardData
=
e
.
originalEvent
.
clipboardData
;
if
(
!
clipboardData
)
return
;
const
documentFragment
=
window
.
gl
.
utils
.
getSelectedFragment
();
const
documentFragment
=
getSelectedFragment
();
if
(
!
documentFragment
)
return
;
const
el
=
transformer
(
documentFragment
.
cloneNode
(
true
));
...
...
@@ -412,7 +412,7 @@ class CopyAsGFM {
for
(
const
selector
in
rules
)
{
const
func
=
rules
[
selector
];
if
(
!
window
.
gl
.
utils
.
nodeMatchesSelector
(
node
,
selector
))
continue
;
if
(
!
nodeMatchesSelector
(
node
,
selector
))
continue
;
let
result
;
if
(
func
.
length
===
2
)
{
...
...
app/assets/javascripts/dispatcher.js
View file @
2328e10a
...
...
@@ -83,6 +83,7 @@ import initProjectVisibilitySelector from './project_visibility';
import
GpgBadges
from
'
./gpg_badges
'
;
import
UserFeatureHelper
from
'
./helpers/user_feature_helper
'
;
import
initChangesDropdown
from
'
./init_changes_dropdown
'
;
import
{
ajaxGet
,
convertPermissionToBoolean
}
from
'
./lib/utils/common_utils
'
;
// EE-only
import
ApproversSelect
from
'
./approvers_select
'
;
...
...
@@ -112,7 +113,7 @@ import initGroupAnalytics from './init_group_analytics';
$
(
'
.js-gfm-input:not(.js-vue-textarea)
'
).
each
((
i
,
el
)
=>
{
const
gfm
=
new
GfmAutoComplete
(
gl
.
GfmAutoComplete
&&
gl
.
GfmAutoComplete
.
dataSources
);
const
enableGFM
=
gl
.
utils
.
convertPermissionToBoolean
(
el
.
dataset
.
supportsAutocomplete
);
const
enableGFM
=
convertPermissionToBoolean
(
el
.
dataset
.
supportsAutocomplete
);
gfm
.
setup
(
$
(
el
),
{
emojis
:
true
,
members
:
enableGFM
,
...
...
@@ -385,7 +386,7 @@ import initGroupAnalytics from './init_group_analytics';
if
(
$
(
'
.project-show-activity
'
).
length
)
new
gl
.
Activities
();
$
(
'
#tree-slider
'
).
waitForImages
(
function
()
{
gl
.
utils
.
ajaxGet
(
document
.
querySelector
(
'
.js-tree-content
'
).
dataset
.
logsPath
);
ajaxGet
(
document
.
querySelector
(
'
.js-tree-content
'
).
dataset
.
logsPath
);
});
initGeoInfoModal
();
...
...
@@ -475,7 +476,7 @@ import initGroupAnalytics from './init_group_analytics';
new
UserCallout
({
setCalloutPerProject
:
true
});
$
(
'
#tree-slider
'
).
waitForImages
(
function
()
{
gl
.
utils
.
ajaxGet
(
document
.
querySelector
(
'
.js-tree-content
'
).
dataset
.
logsPath
);
ajaxGet
(
document
.
querySelector
(
'
.js-tree-content
'
).
dataset
.
logsPath
);
});
break
;
case
'
projects:find_file:show
'
:
...
...
app/assets/javascripts/environments/components/environment.vue
View file @
2328e10a
...
...
@@ -6,7 +6,7 @@ import environmentTable from './environments_table.vue';
import
EnvironmentsStore
from
'
../stores/environments_store
'
;
import
loadingIcon
from
'
../../vue_shared/components/loading_icon.vue
'
;
import
tablePagination
from
'
../../vue_shared/components/table_pagination.vue
'
;
import
'
../../lib/utils/common_utils
'
;
import
{
convertPermissionToBoolean
,
getParameterByName
,
setParamInURL
}
from
'
../../lib/utils/common_utils
'
;
import
eventHub
from
'
../event_hub
'
;
import
Poll
from
'
../../lib/utils/poll
'
;
import
environmentsMixin
from
'
../mixins/environments_mixin
'
;
...
...
@@ -52,19 +52,19 @@ export default {
computed
:
{
scope
()
{
return
g
l
.
utils
.
g
etParameterByName
(
'
scope
'
);
return
getParameterByName
(
'
scope
'
);
},
canReadEnvironmentParsed
()
{
return
gl
.
utils
.
convertPermissionToBoolean
(
this
.
canReadEnvironment
);
return
convertPermissionToBoolean
(
this
.
canReadEnvironment
);
},
canCreateDeploymentParsed
()
{
return
gl
.
utils
.
convertPermissionToBoolean
(
this
.
canCreateDeployment
);
return
convertPermissionToBoolean
(
this
.
canCreateDeployment
);
},
canCreateEnvironmentParsed
()
{
return
gl
.
utils
.
convertPermissionToBoolean
(
this
.
canCreateEnvironment
);
return
convertPermissionToBoolean
(
this
.
canCreateEnvironment
);
},
/**
...
...
@@ -83,8 +83,8 @@ export default {
* Toggles loading property.
*/
created
()
{
const
scope
=
g
l
.
utils
.
g
etParameterByName
(
'
scope
'
)
||
this
.
visibility
;
const
page
=
g
l
.
utils
.
g
etParameterByName
(
'
page
'
)
||
this
.
pageNumber
;
const
scope
=
getParameterByName
(
'
scope
'
)
||
this
.
visibility
;
const
page
=
getParameterByName
(
'
page
'
)
||
this
.
pageNumber
;
this
.
service
=
new
EnvironmentsService
(
this
.
endpoint
);
...
...
@@ -154,15 +154,15 @@ export default {
* @return {String}
*/
changePage
(
pageNumber
)
{
const
param
=
gl
.
utils
.
setParamInURL
(
'
page
'
,
pageNumber
);
const
param
=
setParamInURL
(
'
page
'
,
pageNumber
);
gl
.
utils
.
visitUrl
(
param
);
return
param
;
},
fetchEnvironments
()
{
const
scope
=
g
l
.
utils
.
g
etParameterByName
(
'
scope
'
)
||
this
.
visibility
;
const
page
=
g
l
.
utils
.
g
etParameterByName
(
'
page
'
)
||
this
.
pageNumber
;
const
scope
=
getParameterByName
(
'
scope
'
)
||
this
.
visibility
;
const
page
=
getParameterByName
(
'
page
'
)
||
this
.
pageNumber
;
this
.
isLoading
=
true
;
...
...
app/assets/javascripts/environments/folder/environments_folder_view.vue
View file @
2328e10a
...
...
@@ -9,7 +9,7 @@ import tablePagination from '../../vue_shared/components/table_pagination.vue';
import
Poll
from
'
../../lib/utils/poll
'
;
import
eventHub
from
'
../event_hub
'
;
import
environmentsMixin
from
'
../mixins/environments_mixin
'
;
import
'
../../lib/utils/common_utils
'
;
import
{
convertPermissionToBoolean
,
getParameterByName
,
setParamInURL
}
from
'
../../lib/utils/common_utils
'
;
export
default
{
components
:
{
...
...
@@ -48,15 +48,15 @@ export default {
computed
:
{
scope
()
{
return
g
l
.
utils
.
g
etParameterByName
(
'
scope
'
);
return
getParameterByName
(
'
scope
'
);
},
canReadEnvironmentParsed
()
{
return
gl
.
utils
.
convertPermissionToBoolean
(
this
.
canReadEnvironment
);
return
convertPermissionToBoolean
(
this
.
canReadEnvironment
);
},
canCreateDeploymentParsed
()
{
return
gl
.
utils
.
convertPermissionToBoolean
(
this
.
canCreateDeployment
);
return
convertPermissionToBoolean
(
this
.
canCreateDeployment
);
},
/**
...
...
@@ -83,8 +83,8 @@ export default {
* Toggles loading property.
*/
created
()
{
const
scope
=
g
l
.
utils
.
g
etParameterByName
(
'
scope
'
)
||
this
.
visibility
;
const
page
=
g
l
.
utils
.
g
etParameterByName
(
'
page
'
)
||
this
.
pageNumber
;
const
scope
=
getParameterByName
(
'
scope
'
)
||
this
.
visibility
;
const
page
=
getParameterByName
(
'
page
'
)
||
this
.
pageNumber
;
this
.
service
=
new
EnvironmentsService
(
this
.
endpoint
);
...
...
@@ -137,15 +137,15 @@ export default {
* @param {Number} pageNumber desired page to go to.
*/
changePage
(
pageNumber
)
{
const
param
=
gl
.
utils
.
setParamInURL
(
'
page
'
,
pageNumber
);
const
param
=
setParamInURL
(
'
page
'
,
pageNumber
);
gl
.
utils
.
visitUrl
(
param
);
return
param
;
},
fetchEnvironments
()
{
const
scope
=
g
l
.
utils
.
g
etParameterByName
(
'
scope
'
)
||
this
.
visibility
;
const
page
=
g
l
.
utils
.
g
etParameterByName
(
'
page
'
)
||
this
.
pageNumber
;
const
scope
=
getParameterByName
(
'
scope
'
)
||
this
.
visibility
;
const
page
=
getParameterByName
(
'
page
'
)
||
this
.
pageNumber
;
this
.
isLoading
=
true
;
...
...
app/assets/javascripts/environments/stores/environments_store.js
View file @
2328e10a
import
'
~/lib/utils/common_utils
'
;
import
{
parseIntPagination
,
normalizeHeaders
}
from
'
~/lib/utils/common_utils
'
;
/**
* Environments Store.
*
...
...
@@ -97,8 +97,8 @@ export default class EnvironmentsStore {
* @return {Object}
*/
setPagination
(
pagination
=
{})
{
const
normalizedHeaders
=
gl
.
utils
.
normalizeHeaders
(
pagination
);
const
paginationInformation
=
gl
.
utils
.
parseIntPagination
(
normalizedHeaders
);
const
normalizedHeaders
=
normalizeHeaders
(
pagination
);
const
paginationInformation
=
parseIntPagination
(
normalizedHeaders
);
this
.
state
.
paginationInformation
=
paginationInformation
;
return
paginationInformation
;
...
...
app/assets/javascripts/groups/components/groups.vue
View file @
2328e10a
<
script
>
import
tablePagination
from
'
~/vue_shared/components/table_pagination.vue
'
;
import
eventHub
from
'
../event_hub
'
;
import
{
getParameterByName
}
from
'
../../lib/utils/common_utils
'
;
export
default
{
props
:
{
...
...
@@ -18,8 +19,8 @@ export default {
},
methods
:
{
change
(
page
)
{
const
filterGroupsParam
=
g
l
.
utils
.
g
etParameterByName
(
'
filter_groups
'
);
const
sortParam
=
g
l
.
utils
.
g
etParameterByName
(
'
sort
'
);
const
filterGroupsParam
=
getParameterByName
(
'
filter_groups
'
);
const
sortParam
=
getParameterByName
(
'
sort
'
);
eventHub
.
$emit
(
'
fetchPage
'
,
page
,
filterGroupsParam
,
sortParam
);
},
},
...
...
app/assets/javascripts/groups/groups_filterable_list.js
View file @
2328e10a
import
FilterableList
from
'
~/filterable_list
'
;
import
eventHub
from
'
./event_hub
'
;
import
{
getParameterByName
}
from
'
../lib/utils/common_utils
'
;
export
default
class
GroupFilterableList
extends
FilterableList
{
constructor
({
form
,
filter
,
holder
,
filterEndpoint
,
pagePath
})
{
...
...
@@ -54,7 +55,7 @@ export default class GroupFilterableList extends FilterableList {
e
.
preventDefault
();
const
queryData
=
{};
const
sortParam
=
g
l
.
utils
.
g
etParameterByName
(
'
sort
'
,
e
.
currentTarget
.
href
);
const
sortParam
=
getParameterByName
(
'
sort
'
,
e
.
currentTarget
.
href
);
if
(
sortParam
)
{
queryData
.
sort
=
sortParam
;
...
...
app/assets/javascripts/groups/index.js
View file @
2328e10a
...
...
@@ -8,6 +8,7 @@ import GroupItem from './components/group_item.vue';
import
GroupsStore
from
'
./stores/groups_store
'
;
import
GroupsService
from
'
./services/groups_service
'
;
import
eventHub
from
'
./event_hub
'
;
import
{
getParameterByName
}
from
'
../lib/utils/common_utils
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
const
el
=
document
.
getElementById
(
'
dashboard-group-app
'
);
...
...
@@ -58,17 +59,17 @@ document.addEventListener('DOMContentLoaded', () => {
this
.
isLoading
=
true
;
}
pageParam
=
g
l
.
utils
.
g
etParameterByName
(
'
page
'
);
pageParam
=
getParameterByName
(
'
page
'
);
if
(
pageParam
)
{
page
=
pageParam
;
}
filterGroupsParam
=
g
l
.
utils
.
g
etParameterByName
(
'
filter_groups
'
);
filterGroupsParam
=
getParameterByName
(
'
filter_groups
'
);
if
(
filterGroupsParam
)
{
filterGroups
=
filterGroupsParam
;
}
sortParam
=
g
l
.
utils
.
g
etParameterByName
(
'
sort
'
);
sortParam
=
getParameterByName
(
'
sort
'
);
if
(
sortParam
)
{
sort
=
sortParam
;
}
...
...
app/assets/javascripts/groups/stores/groups_store.js
View file @
2328e10a
import
Vue
from
'
vue
'
;
import
{
parseIntPagination
,
normalizeHeaders
}
from
'
../../lib/utils/common_utils
'
;
export
default
class
GroupsStore
{
constructor
()
{
...
...
@@ -30,8 +31,8 @@ export default class GroupsStore {
let
paginationInfo
;
if
(
Object
.
keys
(
pagination
).
length
)
{
const
normalizedHeaders
=
gl
.
utils
.
normalizeHeaders
(
pagination
);
paginationInfo
=
gl
.
utils
.
parseIntPagination
(
normalizedHeaders
);
const
normalizedHeaders
=
normalizeHeaders
(
pagination
);
paginationInfo
=
parseIntPagination
(
normalizedHeaders
);
}
else
{
paginationInfo
=
pagination
;
}
...
...
app/assets/javascripts/groups_select.js
View file @
2328e10a
...
...
@@ -4,6 +4,7 @@
prefer-rest-params, prefer-spread, no-unused-vars, prefer-template,
promise/catch-or-return */
import
Api
from
'
./api
'
;
import
{
normalizeCRLFHeaders
}
from
'
./lib/utils/common_utils
'
;
var
slice
=
[].
slice
;
...
...
@@ -30,7 +31,7 @@ window.GroupsSelect = (function() {
$
.
ajax
(
params
).
then
((
data
,
status
,
xhr
)
=>
{
const
results
=
data
||
[];
const
headers
=
gl
.
utils
.
normalizeCRLFHeaders
(
xhr
.
getAllResponseHeaders
());
const
headers
=
normalizeCRLFHeaders
(
xhr
.
getAllResponseHeaders
());
const
currentPage
=
parseInt
(
headers
[
'
X-PAGE
'
],
10
)
||
0
;
const
totalPages
=
parseInt
(
headers
[
'
X-TOTAL-PAGES
'
],
10
)
||
0
;
const
more
=
currentPage
<
totalPages
;
...
...
app/assets/javascripts/issuable/issuable_bundle.js
View file @
2328e10a
import
Vue
from
'
vue
'
;
import
RelatedIssuesRoot
from
'
./related_issues/components/related_issues_root.vue
'
;
import
{
convertPermissionToBoolean
}
from
'
../lib/utils/common_utils
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
const
relatedIssuesRootElement
=
document
.
querySelector
(
'
.js-related-issues-root
'
);
...
...
@@ -13,7 +14,7 @@ document.addEventListener('DOMContentLoaded', () => {
render
:
createElement
=>
createElement
(
'
related-issues-root
'
,
{
props
:
{
endpoint
:
relatedIssuesRootElement
.
dataset
.
endpoint
,
canAddRelatedIssues
:
gl
.
utils
.
convertPermissionToBoolean
(
canAddRelatedIssues
:
convertPermissionToBoolean
(
relatedIssuesRootElement
.
dataset
.
canAddRelatedIssues
,
),
helpPath
:
relatedIssuesRootElement
.
dataset
.
helpPath
,
...
...
app/assets/javascripts/lib/utils/common_utils.js
View file @
2328e10a
This diff is collapsed.
Click to expand it.
app/assets/javascripts/lib/utils/poll.js
View file @
2328e10a
import
httpStatusCodes
from
'
./http_status
'
;
import
{
normalizeHeaders
}
from
'
./common_utils
'
;
/**
* Polling utility for handling realtime updates.
...
...
@@ -57,7 +58,7 @@ export default class Poll {
}
checkConditions
(
response
)
{
const
headers
=
gl
.
utils
.
normalizeHeaders
(
response
.
headers
);
const
headers
=
normalizeHeaders
(
response
.
headers
);
const
pollInterval
=
parseInt
(
headers
[
this
.
intervalHeader
],
10
);
if
(
pollInterval
>
0
&&
response
.
status
===
httpStatusCodes
.
OK
&&
this
.
canPoll
)
{
...
...
app/assets/javascripts/main.js
View file @
2328e10a
...
...
@@ -40,7 +40,7 @@ import './commit/image_file';
// lib/utils
import
'
./lib/utils/bootstrap_linked_tabs
'
;
import
'
./lib/utils/common_utils
'
;
import
{
handleLocationHash
}
from
'
./lib/utils/common_utils
'
;
import
'
./lib/utils/datetime_utility
'
;
import
'
./lib/utils/pretty_time
'
;
import
'
./lib/utils/text_utility
'
;
...
...
@@ -169,10 +169,10 @@ document.addEventListener('beforeunload', function () {
$
(
'
[data-toggle="popover"]
'
).
popover
(
'
destroy
'
);
});
window
.
addEventListener
(
'
hashchange
'
,
gl
.
utils
.
handleLocationHash
);
window
.
addEventListener
(
'
hashchange
'
,
handleLocationHash
);
window
.
addEventListener
(
'
load
'
,
function
onLoad
()
{
window
.
removeEventListener
(
'
load
'
,
onLoad
,
false
);
gl
.
utils
.
handleLocationHash
();
handleLocationHash
();
},
false
);
gl
.
lazyLoader
=
new
LazyLoader
({
...
...
@@ -198,7 +198,7 @@ $(function () {
$body
.
on
(
'
click
'
,
'
a[href^="#"]
'
,
function
()
{
var
href
=
this
.
getAttribute
(
'
href
'
);
if
(
href
.
substr
(
1
)
===
gl
.
utils
.
getLocationHash
())
{
setTimeout
(
gl
.
utils
.
handleLocationHash
,
1
);
setTimeout
(
handleLocationHash
,
1
);
}
});
...
...
app/assets/javascripts/merge_request_tabs.js
View file @
2328e10a
...
...
@@ -7,6 +7,11 @@ import './flash';
import
BlobForkSuggestion
from
'
./blob/blob_fork_suggestion
'
;
import
initChangesDropdown
from
'
./init_changes_dropdown
'
;
import
bp
from
'
./breakpoints
'
;
import
{
parseUrlPathname
,
handleLocationHash
,
isMetaClick
,
}
from
'
./lib/utils/common_utils
'
;
/* eslint-disable max-len */
// MergeRequestTabs
...
...
@@ -114,7 +119,7 @@ import bp from './breakpoints';
}
clickTab
(
e
)
{
if
(
e
.
currentTarget
&&
gl
.
utils
.
isMetaClick
(
e
))
{
if
(
e
.
currentTarget
&&
isMetaClick
(
e
))
{
const
targetLink
=
e
.
currentTarget
.
getAttribute
(
'
href
'
);
e
.
stopImmediatePropagation
();
e
.
preventDefault
();
...
...
@@ -260,7 +265,7 @@ import bp from './breakpoints';
// We extract pathname for the current Changes tab anchor href
// some pages like MergeRequestsController#new has query parameters on that anchor
const
urlPathname
=
gl
.
utils
.
parseUrlPathname
(
source
);
const
urlPathname
=
parseUrlPathname
(
source
);
this
.
ajaxGet
({
url
:
`
${
urlPathname
}
.json
${
location
.
search
}
`
,
...
...
@@ -309,7 +314,7 @@ import bp from './breakpoints';
forceShow
:
true
,
});
anchor
[
0
].
scrollIntoView
();
window
.
gl
.
utils
.
handleLocationHash
();
handleLocationHash
();
// We have multiple elements on the page with `#note_xxx`
// (discussion and diff tabs) and `:target` only applies to the first
anchor
.
addClass
(
'
target
'
);
...
...
app/assets/javascripts/mirrors/mirror_pull.js
View file @
2328e10a
/* global Flash */
import
AUTH_METHOD
from
'
./constants
'
;
import
{
backOff
}
from
'
../lib/utils/common_utils
'
;
export
default
class
MirrorPull
{
constructor
(
formSelector
)
{
...
...
@@ -65,7 +66,7 @@ export default class MirrorPull {
$btnLoadSpinner
.
removeClass
(
'
hidden
'
);
// Make backOff polling to get data
gl
.
utils
.
backOff
((
next
,
stop
)
=>
{
backOff
((
next
,
stop
)
=>
{
$
.
getJSON
(
`
${
projectMirrorSSHEndpoint
}
?ssh_url=
${
repositoryUrl
}
`
)
.
done
((
res
,
statusText
,
header
)
=>
{
if
(
header
.
status
===
204
)
{
...
...
app/assets/javascripts/monitoring/components/dashboard.vue
View file @
2328e10a
...
...
@@ -7,6 +7,7 @@
import
EmptyState
from
'
./empty_state.vue
'
;
import
MonitoringStore
from
'
../stores/monitoring_store
'
;
import
eventHub
from
'
../event_hub
'
;
import
{
convertPermissionToBoolean
}
from
'
../../lib/utils/common_utils
'
;
export
default
{
...
...
@@ -17,7 +18,7 @@
return
{
store
,
state
:
'
gettingStarted
'
,
hasMetrics
:
gl
.
utils
.
convertPermissionToBoolean
(
metricsData
.
hasMetrics
),
hasMetrics
:
convertPermissionToBoolean
(
metricsData
.
hasMetrics
),
documentationPath
:
metricsData
.
documentationPath
,
settingsPath
:
metricsData
.
settingsPath
,
metricsEndpoint
:
metricsData
.
additionalMetrics
,
...
...
app/assets/javascripts/monitoring/services/monitoring_service.js
View file @
2328e10a
import
Vue
from
'
vue
'
;
import
VueResource
from
'
vue-resource
'
;
import
statusCodes
from
'
../../lib/utils/http_status
'
;
import
{
backOff
}
from
'
../../lib/utils/common_utils
'
;
Vue
.
use
(
VueResource
);
...
...
@@ -8,7 +9,7 @@ const MAX_REQUESTS = 3;
function
backOffRequest
(
makeRequestCallback
)
{
let
requestCounter
=
0
;
return
gl
.
utils
.
backOff
((
next
,
stop
)
=>
{
return
backOff
((
next
,
stop
)
=>
{
makeRequestCallback
().
then
((
resp
)
=>
{
if
(
resp
.
status
===
statusCodes
.
NO_CONTENT
)
{
requestCounter
+=
1
;
...
...
app/assets/javascripts/notes.js
View file @
2328e10a
...
...
@@ -23,6 +23,7 @@ import loadAwardsHandler from './awards_handler';
import
'
./autosave
'
;
import
'
./dropzone_input
'
;
import
TaskList
from
'
./task_list
'
;
import
{
ajaxPost
,
isInViewport
,
getPagePath
,
scrollToElement
,
isMetaKey
}
from
'
./lib/utils/common_utils
'
;
window
.
autosize
=
autosize
;
window
.
Dropzone
=
Dropzone
;
...
...
@@ -81,7 +82,7 @@ export default class Notes {
this
.
setViewType
(
view
);
// We are in the Merge Requests page so we need another edit form for Changes tab
if
(
g
l
.
utils
.
g
etPagePath
(
1
)
===
'
merge_requests
'
)
{
if
(
getPagePath
(
1
)
===
'
merge_requests
'
)
{
$
(
'
.note-edit-form
'
).
clone
()
.
addClass
(
'
mr-note-edit-form
'
).
insertAfter
(
'
.note-edit-form
'
);
}
...
...
@@ -175,7 +176,7 @@ export default class Notes {
keydownNoteText
(
e
)
{
var
$textarea
,
discussionNoteForm
,
editNote
,
myLastNote
,
myLastNoteEditBtn
,
newText
,
originalText
;
if
(
gl
.
utils
.
isMetaKey
(
e
))
{
if
(
isMetaKey
(
e
))
{
return
;
}
...
...
@@ -644,10 +645,10 @@ export default class Notes {
}
else
{
var
$buttons
=
$el
.
find
(
'
.note-form-actions
'
);
var
isWidgetVisible
=
gl
.
utils
.
isInViewport
(
$el
.
get
(
0
));
var
isWidgetVisible
=
isInViewport
(
$el
.
get
(
0
));
if
(
!
isWidgetVisible
)
{
gl
.
utils
.
scrollToElement
(
$el
);
scrollToElement
(
$el
);
}
$el
.
find
(
'
.js-finish-edit-warning
'
).
show
();
...
...
@@ -1188,7 +1189,7 @@ export default class Notes {
}
static
checkMergeRequestStatus
()
{
if
(
g
l
.
utils
.
g
etPagePath
(
1
)
===
'
merge_requests
'
)
{
if
(
getPagePath
(
1
)
===
'
merge_requests
'
)
{
gl
.
mrWidget
.
checkStatus
();
}
}
...
...
@@ -1326,7 +1327,7 @@ export default class Notes {
* 2) Identify comment type; a) Main thread b) Discussion thread c) Discussion resolve
* 3) Build temporary placeholder element (using `createPlaceholderNote`)
* 4) Show placeholder note on UI
* 5) Perform network request to submit the note using `
gl.utils.
ajaxPost`
* 5) Perform network request to submit the note using `ajaxPost`
* a) If request is successfully completed
* 1. Remove placeholder element
* 2. Show submitted Note element
...
...
@@ -1408,7 +1409,7 @@ export default class Notes {
/* eslint-disable promise/catch-or-return */
// Make request to submit comment on server
gl
.
utils
.
ajaxPost
(
formAction
,
formData
)
ajaxPost
(
formAction
,
formData
)
.
then
((
note
)
=>
{
// Submission successful! remove placeholder
$notesContainer
.
find
(
`#
${
noteUniqueId
}
`
).
remove
();
...
...
@@ -1481,7 +1482,7 @@ export default class Notes {
*
* 1) Get Form metadata
* 2) Update note element with new content
* 3) Perform network request to submit the updated note using `
gl.utils.
ajaxPost`
* 3) Perform network request to submit the updated note using `ajaxPost`
* a) If request is successfully completed
* 1. Show submitted Note element
* b) If request failed
...
...
@@ -1510,7 +1511,7 @@ export default class Notes {
/* eslint-disable promise/catch-or-return */
// Make request to update comment on server
gl
.
utils
.
ajaxPost
(
formAction
,
formData
)
ajaxPost
(
formAction
,
formData
)
.
then
((
note
)
=>
{
// Submission successful! render final note element
this
.
updateNote
(
note
,
$editingNote
);
...
...
app/assets/javascripts/notes/stores/actions.js
View file @
2328e10a
...
...
@@ -7,6 +7,7 @@ import * as constants from '../constants';
import
service
from
'
../services/issue_notes_service
'
;
import
loadAwardsHandler
from
'
../../awards_handler
'
;
import
sidebarTimeTrackingEventHub
from
'
../../sidebar/event_hub
'
;
import
{
isInViewport
,
scrollToElement
}
from
'
../../lib/utils/common_utils
'
;
let
eTagPoll
;
...
...
@@ -211,7 +212,7 @@ export const toggleAwardRequest = ({ commit, getters, dispatch }, data) => {
};
export
const
scrollToNoteIfNeeded
=
(
context
,
el
)
=>
{
if
(
!
gl
.
utils
.
isInViewport
(
el
[
0
]))
{
gl
.
utils
.
scrollToElement
(
el
);
if
(
!
isInViewport
(
el
[
0
]))
{
scrollToElement
(
el
);
}
};
app/assets/javascripts/pager.js
View file @
2328e10a
import
'
~/lib/utils/common_utils
'
;
import
{
getParameterByName
}
from
'
~/lib/utils/common_utils
'
;
import
'
~/lib/utils/url_utility
'
;
(()
=>
{
...
...
@@ -9,7 +9,7 @@ import '~/lib/utils/url_utility';
init
(
limit
=
0
,
preload
=
false
,
disable
=
false
,
prepareData
=
$
.
noop
,
callback
=
$
.
noop
)
{
this
.
url
=
$
(
'
.content_list
'
).
data
(
'
href
'
)
||
gl
.
utils
.
removeParams
([
'
limit
'
,
'
offset
'
]);
this
.
limit
=
limit
;
this
.
offset
=
parseInt
(
g
l
.
utils
.
g
etParameterByName
(
'
offset
'
),
10
)
||
this
.
limit
;
this
.
offset
=
parseInt
(
getParameterByName
(
'
offset
'
),
10
)
||
this
.
limit
;
this
.
disable
=
disable
;
this
.
prepareData
=
prepareData
;
this
.
callback
=
callback
;
...
...
app/assets/javascripts/pipeline_schedules/setup_pipeline_variable_list.js
View file @
2328e10a
import
{
convertPermissionToBoolean
}
from
'
../lib/utils/common_utils
'
;
function
insertRow
(
$row
)
{
const
$rowClone
=
$row
.
clone
();
$rowClone
.
removeAttr
(
'
data-is-persisted
'
);
...
...
@@ -6,7 +8,7 @@ function insertRow($row) {
}
function
removeRow
(
$row
)
{
const
isPersisted
=
gl
.
utils
.
convertPermissionToBoolean
(
$row
.
attr
(
'
data-is-persisted
'
));
const
isPersisted
=
convertPermissionToBoolean
(
$row
.
attr
(
'
data-is-persisted
'
));
if
(
isPersisted
)
{
$row
.
hide
();
...
...
app/assets/javascripts/pipelines.js
View file @
2328e10a
import
LinkedTabs
from
'
./lib/utils/bootstrap_linked_tabs
'
;
import
{
setCiStatusFavicon
}
from
'
./lib/utils/common_utils
'
;
export
default
class
Pipelines
{
constructor
(
options
=
{})
{
...
...
@@ -8,7 +9,7 @@ export default class Pipelines {
}
if
(
options
.
pipelineStatusUrl
)
{
gl
.
utils
.
setCiStatusFavicon
(
options
.
pipelineStatusUrl
);
setCiStatusFavicon
(
options
.
pipelineStatusUrl
);
}
}
}
app/assets/javascripts/pipelines/components/pipelines.vue
View file @
2328e10a
...
...
@@ -4,6 +4,7 @@
import
tablePagination
from
'
../../vue_shared/components/table_pagination.vue
'
;
import
navigationTabs
from
'
./navigation_tabs.vue
'
;
import
navigationControls
from
'
./nav_controls.vue
'
;
import
{
convertPermissionToBoolean
,
getParameterByName
,
setParamInURL
}
from
'
../../lib/utils/common_utils
'
;
export
default
{
props
:
{
...
...
@@ -44,10 +45,10 @@
},
computed
:
{
canCreatePipelineParsed
()
{
return
gl
.
utils
.
convertPermissionToBoolean
(
this
.
canCreatePipeline
);
return
convertPermissionToBoolean
(
this
.
canCreatePipeline
);
},
scope
()
{
const
scope
=
g
l
.
utils
.
g
etParameterByName
(
'
scope
'
);
const
scope
=
getParameterByName
(
'
scope
'
);
return
scope
===
null
?
'
all
'
:
scope
;
},
...
...
@@ -105,10 +106,10 @@
};
},
pageParameter
()
{
return
g
l
.
utils
.
g
etParameterByName
(
'
page
'
)
||
this
.
pagenum
;
return
getParameterByName
(
'
page
'
)
||
this
.
pagenum
;
},
scopeParameter
()
{
return
g
l
.
utils
.
g
etParameterByName
(
'
scope
'
)
||
this
.
apiScope
;
return
getParameterByName
(
'
scope
'
)
||
this
.
apiScope
;
},
},
created
()
{
...
...
@@ -122,7 +123,7 @@
* @param {Number} pageNumber desired page to go to.
*/
change
(
pageNumber
)
{
const
param
=
gl
.
utils
.
setParamInURL
(
'
page
'
,
pageNumber
);
const
param
=
setParamInURL
(
'
page
'
,
pageNumber
);
gl
.
utils
.
visitUrl
(
param
);
return
param
;
...
...
app/assets/javascripts/pipelines/stores/pipelines_store.js
View file @
2328e10a
import
{
parseIntPagination
,
normalizeHeaders
}
from
'
../../lib/utils/common_utils
'
;
export
default
class
PipelinesStore
{
constructor
()
{
this
.
state
=
{};
...
...
@@ -19,8 +21,8 @@ export default class PipelinesStore {
let
paginationInfo
;
if
(
Object
.
keys
(
pagination
).
length
)
{
const
normalizedHeaders
=
gl
.
utils
.
normalizeHeaders
(
pagination
);
paginationInfo
=
gl
.
utils
.
parseIntPagination
(
normalizedHeaders
);
const
normalizedHeaders
=
normalizeHeaders
(
pagination
);
paginationInfo
=
parseIntPagination
(
normalizedHeaders
);
}
else
{
paginationInfo
=
pagination
;
}
...
...
app/assets/javascripts/profile/profile.js
View file @
2328e10a
/* eslint-disable comma-dangle, no-unused-vars, class-methods-use-this, quotes, consistent-return, func-names, prefer-arrow-callback, space-before-function-paren, max-len */
/* global Flash */
import
{
getPagePath
}
from
'
../lib/utils/common_utils
'
;
((
global
)
=>
{
class
Profile
{
...
...
@@ -93,7 +94,7 @@
return
$title
.
val
(
comment
[
1
]).
change
();
}
});
if
(
g
lobal
.
utils
.
g
etPagePath
()
===
'
profiles
'
)
{
if
(
getPagePath
()
===
'
profiles
'
)
{
return
new
Profile
();
}
});
...
...
app/assets/javascripts/projects/settings_service_desk/service_desk_bundle.js
View file @
2328e10a
import
Vue
from
'
vue
'
;
import
serviceDeskRoot
from
'
./components/service_desk_root.vue
'
;
import
{
convertPermissionToBoolean
}
from
'
../../lib/utils/common_utils
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
const
serviceDeskRootElement
=
document
.
querySelector
(
'
.js-service-desk-setting-root
'
);
...
...
@@ -10,7 +11,7 @@ document.addEventListener('DOMContentLoaded', () => {
data
()
{
const
dataset
=
serviceDeskRootElement
.
dataset
;
return
{
initialIsEnabled
:
gl
.
utils
.
convertPermissionToBoolean
(
initialIsEnabled
:
convertPermissionToBoolean
(
dataset
.
enabled
,
),
endpoint
:
dataset
.
endpoint
,
...
...
app/assets/javascripts/prometheus_metrics/prometheus_metrics.js
View file @
2328e10a
import
PANEL_STATE
from
'
./constants
'
;
import
{
backOff
}
from
'
../lib/utils/common_utils
'
;
export
default
class
PrometheusMetrics
{
constructor
(
wrapperSelector
)
{
...
...
@@ -79,7 +80,7 @@ export default class PrometheusMetrics {
loadActiveMetrics
()
{
this
.
showMonitoringMetricsPanelState
(
PANEL_STATE
.
LOADING
);
gl
.
utils
.
backOff
((
next
,
stop
)
=>
{
backOff
((
next
,
stop
)
=>
{
$
.
getJSON
(
this
.
activeMetricsEndpoint
)
.
done
((
res
)
=>
{
if
(
res
&&
res
.
success
)
{
...
...
app/assets/javascripts/search_autocomplete.js
View file @
2328e10a
/* eslint-disable comma-dangle, no-return-assign, one-var, no-var, no-underscore-dangle, one-var-declaration-per-line, no-unused-vars, no-cond-assign, consistent-return, object-shorthand, prefer-arrow-callback, func-names, space-before-function-paren, prefer-template, quotes, class-methods-use-this, no-unused-expressions, no-sequences, wrap-iife, no-lonely-if, no-else-return, no-param-reassign, vars-on-top, max-len */
import
{
isInGroupsPage
,
isInProjectPage
,
getGroupSlug
,
getProjectSlug
}
from
'
./lib/utils/common_utils
'
;
((
global
)
=>
{
const
KEYCODE
=
{
...
...
@@ -146,14 +147,14 @@
}
getCategoryContents
()
{
var
dashboardOptions
,
groupOptions
,
issuesPath
,
items
,
mrPath
,
name
,
options
,
projectOptions
,
userId
,
userName
,
utils
;
var
dashboardOptions
,
groupOptions
,
issuesPath
,
items
,
mrPath
,
name
,
options
,
projectOptions
,
userId
,
userName
;
userId
=
gon
.
current_user_id
;
userName
=
gon
.
current_username
;
utils
=
gl
.
utils
,
projectOptions
=
gl
.
projectOptions
,
groupOptions
=
gl
.
groupOptions
,
dashboardOptions
=
gl
.
dashboardOptions
;
if
(
utils
.
isInGroupsPage
()
&&
groupOptions
)
{
options
=
groupOptions
[
utils
.
getGroupSlug
()];
}
else
if
(
utils
.
isInProjectPage
()
&&
projectOptions
)
{
options
=
projectOptions
[
utils
.
getProjectSlug
()];
projectOptions
=
gl
.
projectOptions
,
groupOptions
=
gl
.
groupOptions
,
dashboardOptions
=
gl
.
dashboardOptions
;
if
(
isInGroupsPage
()
&&
groupOptions
)
{
options
=
groupOptions
[
getGroupSlug
()];
}
else
if
(
isInProjectPage
()
&&
projectOptions
)
{
options
=
projectOptions
[
getProjectSlug
()];
}
else
if
(
dashboardOptions
)
{
options
=
dashboardOptions
;
}
...
...
app/assets/javascripts/todos.js
View file @
2328e10a
/* eslint-disable class-methods-use-this, no-unneeded-ternary, quote-props */
import
UsersSelect
from
'
./users_select
'
;
import
{
isMetaClick
}
from
'
./lib/utils/common_utils
'
;
export
default
class
Todos
{
constructor
()
{
...
...
@@ -137,22 +138,17 @@ export default class Todos {
goToTodoUrl
(
e
)
{
const
todoLink
=
this
.
dataset
.
url
;
if
(
!
todoLink
)
{
if
(
!
todoLink
||
e
.
target
.
tagName
===
'
A
'
||
e
.
target
.
tagName
===
'
IMG
'
)
{
return
;
}
if
(
gl
.
utils
.
isMetaClick
(
e
))
{
e
.
stopPropagation
();
e
.
preventDefault
();
if
(
isMetaClick
(
e
))
{
const
windowTarget
=
'
_blank
'
;
const
selected
=
e
.
target
;
e
.
stopPropagation
();
e
.
preventDefault
();
if
(
selected
.
tagName
===
'
IMG
'
)
{
const
avatarUrl
=
selected
.
parentElement
.
getAttribute
(
'
href
'
);
window
.
open
(
avatarUrl
,
windowTarget
);
}
else
{
window
.
open
(
todoLink
,
windowTarget
);
}
window
.
open
(
todoLink
,
windowTarget
);
}
else
{
gl
.
utils
.
visitUrl
(
todoLink
);
}
...
...
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js
View file @
2328e10a
import
statusCodes
from
'
../../lib/utils/http_status
'
;
import
{
bytesToMiB
}
from
'
../../lib/utils/number_utils
'
;
import
{
backOff
}
from
'
../../lib/utils/common_utils
'
;
import
MemoryGraph
from
'
../../vue_shared/components/memory_graph
'
;
import
MRWidgetService
from
'
../services/mr_widget_service
'
;
...
...
@@ -84,7 +84,7 @@ export default {
}
},
loadMetrics
()
{
gl
.
utils
.
backOff
((
next
,
stop
)
=>
{
backOff
((
next
,
stop
)
=>
{
MRWidgetService
.
fetchMetrics
(
this
.
metricsUrl
)
.
then
((
res
)
=>
{
if
(
res
.
status
===
statusCodes
.
NO_CONTENT
)
{
...
...
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
View file @
2328e10a
...
...
@@ -31,6 +31,7 @@ import {
SquashBeforeMerge
,
notify
,
}
from
'
./dependencies
'
;
import
{
setFavicon
}
from
'
../lib/utils/common_utils
'
;
export
default
{
el
:
'
#js-vue-mr-widget
'
,
...
...
@@ -88,7 +89,7 @@ export default {
.
then
((
res
)
=>
{
this
.
handleNotification
(
res
);
this
.
mr
.
setData
(
res
);
this
.
setFavicon
();
this
.
setFavicon
Helper
();
if
(
cb
)
{
cb
.
call
(
null
,
res
);
...
...
@@ -115,9 +116,9 @@ export default {
immediateExecution
:
true
,
});
},
setFavicon
()
{
setFavicon
Helper
()
{
if
(
this
.
mr
.
ciStatusFaviconPath
)
{
gl
.
utils
.
setFavicon
(
this
.
mr
.
ciStatusFaviconPath
);
setFavicon
(
this
.
mr
.
ciStatusFaviconPath
);
}
},
fetchDeployments
()
{
...
...
@@ -191,7 +192,7 @@ export default {
});
},
handleMounted
()
{
this
.
setFavicon
();
this
.
setFavicon
Helper
();
this
.
initDeploymentsPolling
();
},
},
...
...
changelogs/unreleased/37220-es-modules.yml
0 → 100644
View file @
2328e10a
---
title
:
Exports common_utils utility functions as modules
merge_request
:
author
:
type
:
other
spec/javascripts/environments/folder/environments_folder_view_spec.js
View file @
2328e10a
...
...
@@ -14,6 +14,10 @@ describe('Environments Folder View', () => {
window
.
history
.
pushState
({},
null
,
'
environments/folders/build
'
);
});
afterEach
(()
=>
{
window
.
history
.
pushState
({},
null
,
'
/
'
);
});
let
component
;
describe
(
'
successfull request
'
,
()
=>
{
...
...
spec/javascripts/lib/utils/common_utils_spec.js
View file @
2328e10a
This diff is collapsed.
Click to expand it.
spec/javascripts/merge_request_tabs_spec.js
View file @
2328e10a
...
...
@@ -78,8 +78,9 @@ import 'vendor/jquery.scrollTo';
});
describe
(
'
meta click
'
,
()
=>
{
let
metakeyEvent
;
beforeEach
(
function
()
{
spyOn
(
gl
.
utils
,
'
isMetaClick
'
).
and
.
returnValue
(
true
);
metakeyEvent
=
$
.
Event
(
'
click
'
,
{
keyCode
:
91
,
ctrlKey
:
true
}
);
});
it
(
'
opens page when commits link is clicked
'
,
function
()
{
...
...
@@ -89,7 +90,7 @@ import 'vendor/jquery.scrollTo';
});
this
.
class
.
bindEvents
();
document
.
querySelector
(
'
.merge-request-tabs .commits-tab a
'
).
click
(
);
$
(
'
.merge-request-tabs .commits-tab a
'
).
trigger
(
metakeyEvent
);
});
it
(
'
opens page when commits badge is clicked
'
,
function
()
{
...
...
@@ -99,7 +100,7 @@ import 'vendor/jquery.scrollTo';
});
this
.
class
.
bindEvents
();
document
.
querySelector
(
'
.merge-request-tabs .commits-tab a .badge
'
).
click
(
);
$
(
'
.merge-request-tabs .commits-tab a .badge
'
).
trigger
(
metakeyEvent
);
});
});
...
...
spec/javascripts/todos_spec.js
View file @
2328e10a
...
...
@@ -26,37 +26,30 @@ describe('Todos', () => {
describe
(
'
meta click
'
,
()
=>
{
let
visitUrlSpy
;
let
windowOpenSpy
;
let
metakeyEvent
;
beforeEach
(()
=>
{
spyOn
(
gl
.
utils
,
'
isMetaClick
'
).
and
.
returnValue
(
true
);
metakeyEvent
=
$
.
Event
(
'
click
'
,
{
keyCode
:
91
,
ctrlKey
:
true
}
);
visitUrlSpy
=
spyOn
(
gl
.
utils
,
'
visitUrl
'
).
and
.
callFake
(()
=>
{});
windowOpenSpy
=
spyOn
(
window
,
'
open
'
).
and
.
callFake
(()
=>
{});
});
it
(
'
opens the todo url in another tab
'
,
(
done
)
=>
{
it
(
'
opens the todo url in another tab
'
,
()
=>
{
const
todoLink
=
todoItem
.
dataset
.
url
;
spyOn
(
window
,
'
open
'
).
and
.
callFake
((
url
,
target
)
=>
{
expect
(
todoLink
).
toEqual
(
url
);
expect
(
target
).
toEqual
(
'
_blank
'
);
done
();
});
$
(
'
.todos-list .todo
'
).
trigger
(
metakeyEvent
);
todoItem
.
click
();
expect
(
visitUrlSpy
).
not
.
toHaveBeenCalled
();
expect
(
windowOpenSpy
).
toHaveBeenCalledWith
(
todoLink
,
'
_blank
'
);
});
it
(
'
opens the avatar
\'
s url in another tab when the avatar is clicked
'
,
(
done
)
=>
{
const
avatarImage
=
todoItem
.
querySelector
(
'
img
'
);
const
avatarUrl
=
avatarImage
.
parentElement
.
getAttribute
(
'
href
'
);
it
(
'
run native funcionality when avatar is clicked
'
,
(
)
=>
{
$
(
'
.todos-list a
'
).
on
(
'
click
'
,
e
=>
e
.
preventDefault
()
);
$
(
'
.todos-list img
'
).
trigger
(
metakeyEvent
);
spyOn
(
window
,
'
open
'
).
and
.
callFake
((
url
,
target
)
=>
{
expect
(
avatarUrl
).
toEqual
(
url
);
expect
(
target
).
toEqual
(
'
_blank
'
);
done
();
});
avatarImage
.
click
();
expect
(
visitUrlSpy
).
not
.
toHaveBeenCalled
();
expect
(
windowOpenSpy
).
not
.
toHaveBeenCalled
();
});
});
});
...
...
spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
View file @
2328e10a
...
...
@@ -224,29 +224,41 @@ describe('mrWidgetOptions', () => {
describe
(
'
handleMounted
'
,
()
=>
{
it
(
'
should call required methods to do the initial kick-off
'
,
()
=>
{
spyOn
(
vm
,
'
initDeploymentsPolling
'
);
spyOn
(
vm
,
'
setFavicon
'
);
spyOn
(
vm
,
'
setFavicon
Helper
'
);
vm
.
handleMounted
();
expect
(
vm
.
setFavicon
).
toHaveBeenCalled
();
expect
(
vm
.
setFavicon
Helper
).
toHaveBeenCalled
();
expect
(
vm
.
initDeploymentsPolling
).
toHaveBeenCalled
();
});
});
describe
(
'
setFavicon
'
,
()
=>
{
let
faviconElement
;
beforeEach
(()
=>
{
const
favicon
=
document
.
createElement
(
'
link
'
);
favicon
.
setAttribute
(
'
id
'
,
'
favicon
'
);
document
.
body
.
appendChild
(
favicon
);
faviconElement
=
document
.
getElementById
(
'
favicon
'
);
});
afterEach
(()
=>
{
document
.
body
.
removeChild
(
document
.
getElementById
(
'
favicon
'
));
});
it
(
'
should call setFavicon method
'
,
()
=>
{
spyOn
(
gl
.
utils
,
'
setFavicon
'
);
vm
.
setFavicon
();
vm
.
setFaviconHelper
();
expect
(
gl
.
utils
.
setFavicon
).
toHaveBeenCalledWith
(
vm
.
mr
.
ciStatusFaviconPath
);
expect
(
faviconElement
.
getAttribute
(
'
href
'
)).
toEqual
(
vm
.
mr
.
ciStatusFaviconPath
);
});
it
(
'
should not call setFavicon when there is no ciStatusFaviconPath
'
,
()
=>
{
spyOn
(
gl
.
utils
,
'
setFavicon
'
);
vm
.
mr
.
ciStatusFaviconPath
=
null
;
vm
.
setFavicon
();
vm
.
setFavicon
Helper
();
expect
(
gl
.
utils
.
setFavicon
).
not
.
toHaveBeenCalled
(
);
expect
(
faviconElement
.
getAttribute
(
'
href
'
)).
toEqual
(
null
);
});
});
...
...
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