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
4b5230e3
Commit
4b5230e3
authored
Mar 31, 2022
by
Rajat Jain
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Frontend review fixes
parent
e2e0cb4f
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
115 additions
and
37 deletions
+115
-37
ee/app/assets/javascripts/related_items_tree/components/related_items_roadmap_app.vue
...lated_items_tree/components/related_items_roadmap_app.vue
+20
-6
ee/app/assets/javascripts/related_items_tree/components/related_items_tree_actions.vue
...ated_items_tree/components/related_items_tree_actions.vue
+2
-10
ee/spec/features/epics/epic_issues_spec.rb
ee/spec/features/epics/epic_issues_spec.rb
+0
-4
ee/spec/features/epics/epic_related_epics_spec.rb
ee/spec/features/epics/epic_related_epics_spec.rb
+2
-8
ee/spec/frontend/related_items_tree/components/__snapshots__/related_items_roadmap_app_spec.js.snap
...ents/__snapshots__/related_items_roadmap_app_spec.js.snap
+31
-0
ee/spec/frontend/related_items_tree/components/__snapshots__/related_items_tree_actions_spec.js.snap
...nts/__snapshots__/related_items_tree_actions_spec.js.snap
+55
-0
ee/spec/frontend/related_items_tree/components/related_items_roadmap_app_spec.js
...d_items_tree/components/related_items_roadmap_app_spec.js
+1
-2
ee/spec/frontend/related_items_tree/components/related_items_tree_actions_spec.js
..._items_tree/components/related_items_tree_actions_spec.js
+1
-7
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
ee/app/assets/javascripts/related_items_tree/components/related_items_roadmap_app.vue
View file @
4b5230e3
<
script
>
<
script
>
import
{
mapState
}
from
'
vuex
'
;
import
{
mapState
}
from
'
vuex
'
;
import
{
GlAlert
}
from
'
@gitlab/ui
'
;
import
{
__
}
from
'
~/locale
'
;
export
default
{
export
default
{
components
:
{
GlAlert
,
},
inject
:
[
'
roadmapAppData
'
],
inject
:
[
'
roadmapAppData
'
],
data
()
{
return
{
loadingError
:
false
,
roadmapLoaded
:
false
,
};
},
computed
:
{
computed
:
{
...
mapState
([
'
allowSubEpics
'
]),
...
mapState
([
'
allowSubEpics
'
]),
roadmapAttrs
()
{
roadmapAttrs
()
{
...
@@ -22,11 +33,7 @@ export default {
...
@@ -22,11 +33,7 @@ export default {
},
},
mounted
()
{
mounted
()
{
if
(
this
.
shouldLoadRoadmap
)
{
if
(
this
.
shouldLoadRoadmap
)
{
this
.
initRoadmap
()
this
.
initRoadmap
();
.
then
(()
=>
{
this
.
roadmapLoaded
=
true
;
})
.
catch
(()
=>
{});
}
}
},
},
methods
:
{
methods
:
{
...
@@ -34,15 +41,22 @@ export default {
...
@@ -34,15 +41,22 @@ export default {
return
import
(
'
ee/roadmap/roadmap_bundle
'
)
return
import
(
'
ee/roadmap/roadmap_bundle
'
)
.
then
((
roadmapBundle
)
=>
{
.
then
((
roadmapBundle
)
=>
{
roadmapBundle
.
default
();
roadmapBundle
.
default
();
this
.
roadmapLoaded
=
true
;
})
})
.
catch
(()
=>
{});
.
catch
(()
=>
{
this
.
loadingError
=
true
;
});
},
},
},
},
loadingFailedText
:
__
(
'
Failed to load Roadmap
'
),
};
};
</
script
>
</
script
>
<
template
>
<
template
>
<div
class=
"gl-px-3 gl-py-3 gl-bg-gray-10"
>
<div
class=
"gl-px-3 gl-py-3 gl-bg-gray-10"
>
<gl-alert
v-if=
"loadingError"
variant=
"danger"
:dismissible=
"false"
>
{{
$options
.
loadingFailedText
}}
</gl-alert>
<div
id=
"roadmap"
class=
"roadmap-app border gl-rounded-base gl-bg-white"
>
<div
id=
"roadmap"
class=
"roadmap-app border gl-rounded-base gl-bg-white"
>
<div
id=
"js-roadmap"
v-bind=
"roadmapAttrs"
></div>
<div
id=
"js-roadmap"
v-bind=
"roadmapAttrs"
></div>
</div>
</div>
...
...
ee/app/assets/javascripts/related_items_tree/components/related_items_tree_actions.vue
View file @
4b5230e3
...
@@ -21,14 +21,6 @@ export default {
...
@@ -21,14 +21,6 @@ export default {
computed
:
{
computed
:
{
...
mapState
([
'
allowSubEpics
'
]),
...
mapState
([
'
allowSubEpics
'
]),
},
},
methods
:
{
onTreeTabClick
()
{
this
.
$emit
(
'
tab-change
'
,
this
.
$options
.
ITEM_TABS
.
TREE
);
},
onRoadmapTabClick
()
{
this
.
$emit
(
'
tab-change
'
,
this
.
$options
.
ITEM_TABS
.
ROADMAP
);
},
},
};
};
</
script
>
</
script
>
...
@@ -40,7 +32,7 @@ export default {
...
@@ -40,7 +32,7 @@ export default {
class=
"js-epic-tree-tab"
class=
"js-epic-tree-tab"
data-testid=
"tree-view-button"
data-testid=
"tree-view-button"
:selected=
"activeTab === $options.ITEM_TABS.TREE"
:selected=
"activeTab === $options.ITEM_TABS.TREE"
@
click=
"
onTreeTabClick
"
@
click=
"
() => $emit('tab-change', this.$options.ITEM_TABS.TREE)
"
>
>
{{
__
(
'
Tree view
'
)
}}
{{
__
(
'
Tree view
'
)
}}
</gl-button>
</gl-button>
...
@@ -49,7 +41,7 @@ export default {
...
@@ -49,7 +41,7 @@ export default {
class=
"js-epic-roadmap-tab"
class=
"js-epic-roadmap-tab"
data-testid=
"roadmap-view-button"
data-testid=
"roadmap-view-button"
:selected=
"activeTab === $options.ITEM_TABS.ROADMAP"
:selected=
"activeTab === $options.ITEM_TABS.ROADMAP"
@
click=
"
onRoadmapTabClick
"
@
click=
"
() => $emit('tab-change', this.$options.ITEM_TABS.ROADMAP)
"
>
>
{{
__
(
'
Roadmap view
'
)
}}
{{
__
(
'
Roadmap view
'
)
}}
</gl-button>
</gl-button>
...
...
ee/spec/features/epics/epic_issues_spec.rb
View file @
4b5230e3
...
@@ -198,10 +198,6 @@ RSpec.describe 'Epic Issues', :js do
...
@@ -198,10 +198,6 @@ RSpec.describe 'Epic Issues', :js do
visit
group_epic_path
(
group
,
last_child
)
visit
group_epic_path
(
group
,
last_child
)
wait_for_requests
wait_for_requests
find
(
'.js-epic-tree-tab'
).
click
wait_for_requests
end
end
it
'user cannot add new epic when hierarchy level limit has been reached'
do
it
'user cannot add new epic when hierarchy level limit has been reached'
do
...
...
ee/spec/features/epics/epic_related_epics_spec.rb
View file @
4b5230e3
...
@@ -18,14 +18,10 @@ RSpec.describe 'Related Epics', :js do
...
@@ -18,14 +18,10 @@ RSpec.describe 'Related Epics', :js do
visit
group_epic_path
(
group
,
epic1
)
visit
group_epic_path
(
group
,
epic1
)
wait_for_requests
wait_for_requests
find
(
'.js-epic-tree-tab'
).
click
wait_for_requests
end
end
def
open_add_epic_form
def
open_add_epic_form
page
.
within
(
'.
js-epic-container
.card-title'
)
do
page
.
within
(
'.
related-issues-block
.card-title'
)
do
page
.
find
(
'button'
).
click
page
.
find
(
'button'
).
click
end
end
end
end
...
@@ -50,9 +46,7 @@ RSpec.describe 'Related Epics', :js do
...
@@ -50,9 +46,7 @@ RSpec.describe 'Related Epics', :js do
describe
'epic body section'
do
describe
'epic body section'
do
it
'user can view related epics section under epic description'
,
:aggregate_failures
do
it
'user can view related epics section under epic description'
,
:aggregate_failures
do
page
.
within
(
'.js-epic-container'
)
do
page
.
within
(
'#related-issues'
)
do
expect
(
page
).
to
have_selector
(
'#related-issues'
)
card_title
=
page
.
find
(
'.card-title'
)
card_title
=
page
.
find
(
'.card-title'
)
expect
(
card_title
).
to
have_content
(
'Linked epics'
)
expect
(
card_title
).
to
have_content
(
'Linked epics'
)
expect
(
card_title
).
to
have_link
(
''
,
href:
'/help/user/group/epics/linked_epics'
)
expect
(
card_title
).
to
have_link
(
''
,
href:
'/help/user/group/epics/linked_epics'
)
...
...
ee/spec/frontend/related_items_tree/components/__snapshots__/related_items_roadmap_app_spec.js.snap
0 → 100644
View file @
4b5230e3
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`RelatedItemsTree RelatedItemsRoadmapApp template renders html 1`] = `
<div
class="gl-px-3 gl-py-3 gl-bg-gray-10"
>
<!---->
<div
class="roadmap-app border gl-rounded-base gl-bg-white"
id="roadmap"
>
<div
data-child-epics="true"
data-empty-state-illustration=""
data-epics-docs-path="/help/user/group/epics/index"
data-epics-path="/groups/group1/-/epics.json?parent_id=1"
data-epics-state="all"
data-full-path="group1"
data-group-id="2"
data-iid="1"
data-inner-height="600"
data-list-epics-path="/groups/group1/-/epics"
data-new-epic-path="/groups/group1/-/epics/new"
data-preset-type="MONTHS"
data-sorted-by="start_date_asc"
id="js-roadmap"
/>
</div>
</div>
`;
ee/spec/frontend/related_items_tree/components/__snapshots__/related_items_tree_actions_spec.js.snap
0 → 100644
View file @
4b5230e3
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`RelatedItemsTree RelatedItemsTreeActions template renders button group, tree view and roadmap view buttons 1`] = `
<div
class="card-header d-flex gl-px-5 gl-pt-4 gl-pt-3 flex-column flex-sm-row border-bottom-0"
>
<div>
<gl-button-group-stub
class="gl-flex-grow-1 gl-display-flex"
data-testid="buttons"
>
<gl-button-stub
buttontextclasses=""
category="primary"
class="js-epic-tree-tab"
data-testid="tree-view-button"
icon=""
selected="true"
size="medium"
variant="default"
>
Tree view
</gl-button-stub>
<gl-button-stub
buttontextclasses=""
category="primary"
class="js-epic-roadmap-tab"
data-testid="roadmap-view-button"
icon=""
size="medium"
variant="default"
>
Roadmap view
</gl-button-stub>
</gl-button-group-stub>
</div>
<div
class="ml-auto gl-display-none gl-sm-display-flex"
/>
<div
class="gl-sm-display-inline-flex gl-display-flex gl-mt-3 gl-sm-mt-0"
>
<toggle-labels-stub
class="gl-sm-ml-3! gl-ml-0!"
/>
</div>
</div>
`;
ee/spec/frontend/related_items_tree/components/related_items_roadmap_app_spec.js
View file @
4b5230e3
...
@@ -34,8 +34,7 @@ describe('RelatedItemsTree', () => {
...
@@ -34,8 +34,7 @@ describe('RelatedItemsTree', () => {
});
});
it
(
'
renders html
'
,
()
=>
{
it
(
'
renders html
'
,
()
=>
{
expect
(
wrapper
.
find
(
'
#roadmap
'
).
exists
()).
toBe
(
true
);
expect
(
wrapper
.
element
).
toMatchSnapshot
();
expect
(
wrapper
.
find
(
'
#js-roadmap
'
).
exists
()).
toBe
(
true
);
});
});
it
(
'
renders data-* attrs
'
,
()
=>
{
it
(
'
renders data-* attrs
'
,
()
=>
{
...
...
ee/spec/frontend/related_items_tree/components/related_items_tree_actions_spec.js
View file @
4b5230e3
...
@@ -37,13 +37,7 @@ describe('RelatedItemsTree', () => {
...
@@ -37,13 +37,7 @@ describe('RelatedItemsTree', () => {
});
});
it
(
'
renders button group, tree view and roadmap view buttons
'
,
()
=>
{
it
(
'
renders button group, tree view and roadmap view buttons
'
,
()
=>
{
const
buttonGroupEl
=
wrapper
.
findByTestId
(
'
buttons
'
);
expect
(
wrapper
.
element
).
toMatchSnapshot
();
const
treeViewEl
=
wrapper
.
findByTestId
(
'
tree-view-button
'
);
const
roadmapViewEl
=
wrapper
.
findByTestId
(
'
roadmap-view-button
'
);
expect
(
buttonGroupEl
.
isVisible
()).
toBe
(
true
);
expect
(
treeViewEl
.
isVisible
()).
toBe
(
true
);
expect
(
roadmapViewEl
.
isVisible
()).
toBe
(
true
);
});
});
it
(
'
does not render roadmap view button when subEpics are not present
'
,
async
()
=>
{
it
(
'
does not render roadmap view button when subEpics are not present
'
,
async
()
=>
{
...
...
locale/gitlab.pot
View file @
4b5230e3
...
@@ -15413,6 +15413,9 @@ msgstr ""
...
@@ -15413,6 +15413,9 @@ msgstr ""
msgid "Failed to load"
msgid "Failed to load"
msgstr ""
msgstr ""
msgid "Failed to load Roadmap"
msgstr ""
msgid "Failed to load assignees."
msgid "Failed to load assignees."
msgstr ""
msgstr ""
...
...
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