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
8c53f838
Commit
8c53f838
authored
Jun 07, 2018
by
Kushal Pandya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pass presetType prop during app init, add preset navigation event
parent
a56990a5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
17 deletions
+30
-17
ee/app/assets/javascripts/roadmap/index.js
ee/app/assets/javascripts/roadmap/index.js
+30
-17
No files found.
ee/app/assets/javascripts/roadmap/index.js
View file @
8c53f838
...
@@ -3,9 +3,11 @@ import Vue from 'vue';
...
@@ -3,9 +3,11 @@ import Vue from 'vue';
import
Translate
from
'
~/vue_shared/translate
'
;
import
Translate
from
'
~/vue_shared/translate
'
;
import
{
convertPermissionToBoolean
}
from
'
~/lib/utils/common_utils
'
;
import
{
convertPermissionToBoolean
}
from
'
~/lib/utils/common_utils
'
;
import
{
getTimeframeWindow
}
from
'
~/lib/utils/datetime
_utility
'
;
import
{
visitUrl
,
mergeUrlParams
}
from
'
~/lib/utils/url
_utility
'
;
import
{
TIMEFRAME_LENGTH
}
from
'
./constants
'
;
import
{
PRESET_TYPES
}
from
'
./constants
'
;
import
{
getTimeframeForPreset
,
getEpicsPathForPreset
}
from
'
./utils/roadmap_utils
'
;
import
RoadmapStore
from
'
./store/roadmap_store
'
;
import
RoadmapStore
from
'
./store/roadmap_store
'
;
import
RoadmapService
from
'
./service/roadmap_service
'
;
import
RoadmapService
from
'
./service/roadmap_service
'
;
...
@@ -16,41 +18,51 @@ Vue.use(Translate);
...
@@ -16,41 +18,51 @@ Vue.use(Translate);
export
default
()
=>
{
export
default
()
=>
{
const
el
=
document
.
getElementById
(
'
js-roadmap
'
);
const
el
=
document
.
getElementById
(
'
js-roadmap
'
);
const
presetButtonsContainer
=
document
.
querySelector
(
'
.js-btn-roadmap-presets
'
);
if
(
!
el
)
{
if
(
!
el
)
{
return
false
;
return
false
;
}
}
// This event handler is to be removed in 11.1 once
// we allow user to save selected preset in db
if
(
presetButtonsContainer
)
{
presetButtonsContainer
.
addEventListener
(
'
click
'
,
e
=>
{
const
presetType
=
e
.
target
.
querySelector
(
'
input[name="presetType"]
'
).
value
;
visitUrl
(
mergeUrlParams
({
layout
:
presetType
},
location
.
href
));
});
}
return
new
Vue
({
return
new
Vue
({
el
,
el
,
components
:
{
components
:
{
roadmapApp
,
roadmapApp
,
},
},
data
()
{
data
()
{
const
supportedPresetTypes
=
Object
.
keys
(
PRESET_TYPES
);
const
dataset
=
this
.
$options
.
el
.
dataset
;
const
dataset
=
this
.
$options
.
el
.
dataset
;
const
hasFiltersApplied
=
convertPermissionToBoolean
(
dataset
.
hasFiltersApplied
);
const
hasFiltersApplied
=
convertPermissionToBoolean
(
dataset
.
hasFiltersApplied
);
const
presetType
=
supportedPresetTypes
.
indexOf
(
dataset
.
presetType
)
>
-
1
?
dataset
.
presetType
:
PRESET_TYPES
.
MONTHS
;
const
filterQueryString
=
window
.
location
.
search
.
substring
(
1
);
const
filterQueryString
=
window
.
location
.
search
.
substring
(
1
);
const
timeframe
=
getTimeframeForPreset
(
presetType
);
const
epicsPath
=
getEpicsPathForPreset
({
basePath
:
dataset
.
epicsPath
,
filterQueryString
,
presetType
,
timeframe
,
});
// Construct Epic API path to include
const
store
=
new
RoadmapStore
(
parseInt
(
dataset
.
groupId
,
0
),
timeframe
,
presetType
);
// `start_date` & `end_date` query params to get list of
// epics only for current timeframe.
const
timeframe
=
getTimeframeWindow
(
TIMEFRAME_LENGTH
);
const
start
=
timeframe
[
0
];
const
end
=
timeframe
[
TIMEFRAME_LENGTH
-
1
];
const
startDate
=
`
${
start
.
getFullYear
()}
-
${
start
.
getMonth
()
+
1
}
-
${
start
.
getDate
()}
`
;
const
endDate
=
`
${
end
.
getFullYear
()}
-
${
end
.
getMonth
()
+
1
}
-
${
end
.
getDate
()}
`
;
let
epicsPath
=
`
${
dataset
.
epicsPath
}
?start_date=
${
startDate
}
&end_date=
${
endDate
}
`
;
if
(
filterQueryString
)
{
epicsPath
+=
`&
${
filterQueryString
}
`
;
}
const
store
=
new
RoadmapStore
(
parseInt
(
dataset
.
groupId
,
0
),
timeframe
);
const
service
=
new
RoadmapService
(
epicsPath
);
const
service
=
new
RoadmapService
(
epicsPath
);
return
{
return
{
store
,
store
,
service
,
service
,
presetType
,
hasFiltersApplied
,
hasFiltersApplied
,
newEpicEndpoint
:
dataset
.
newEpicEndpoint
,
newEpicEndpoint
:
dataset
.
newEpicEndpoint
,
emptyStateIllustrationPath
:
dataset
.
emptyStateIllustration
,
emptyStateIllustrationPath
:
dataset
.
emptyStateIllustration
,
...
@@ -61,6 +73,7 @@ export default () => {
...
@@ -61,6 +73,7 @@ export default () => {
props
:
{
props
:
{
store
:
this
.
store
,
store
:
this
.
store
,
service
:
this
.
service
,
service
:
this
.
service
,
presetType
:
this
.
presetType
,
hasFiltersApplied
:
this
.
hasFiltersApplied
,
hasFiltersApplied
:
this
.
hasFiltersApplied
,
newEpicEndpoint
:
this
.
newEpicEndpoint
,
newEpicEndpoint
:
this
.
newEpicEndpoint
,
emptyStateIllustrationPath
:
this
.
emptyStateIllustrationPath
,
emptyStateIllustrationPath
:
this
.
emptyStateIllustrationPath
,
...
...
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