Skip to content
Snippets Groups Projects
Verified Commit e67545f0 authored by Savas Vedova's avatar Savas Vedova Committed by GitLab
Browse files

Merge branch '329655-roadmap-empty-state-blocks-interaction-with-existing-epics' into 'master'

Continue to show roadmap filters bar when no results to access settings

See merge request !173597



Merged-by: Savas Vedova's avatarSavas Vedova <svedova@gitlab.com>
Approved-by: Savas Vedova's avatarSavas Vedova <svedova@gitlab.com>
Reviewed-by: Savas Vedova's avatarSavas Vedova <svedova@gitlab.com>
Co-authored-by: default avatarChad Lavimoniere <clavimoniere@gitlab.com>
parents 71900a00 5951e7ea
No related branches found
No related tags found
1 merge request!173597Continue to show roadmap filters bar when no results to access settings
Pipeline #1569520315 passed
......@@ -201,8 +201,8 @@ export default {
<template>
<div class="roadmap-app-container gl-h-full">
<roadmap-filters
v-if="showFilteredSearchbar && !epicIid"
ref="roadmapFilters"
:view-only="!showFilteredSearchbar || Boolean(epicIid)"
@toggleSettings="toggleSettings"
/>
<div
......
......@@ -58,6 +58,13 @@ export default {
FilteredSearchBar,
},
mixins: [EpicsFilteredSearchMixin],
props: {
viewOnly: {
type: Boolean,
required: false,
default: false,
},
},
data() {
return {
localRoadmapSettings: {},
......@@ -125,8 +132,10 @@ export default {
<div class="epics-filters epics-roadmap-filters epics-roadmap-filters-gl-ui gl-relative">
<div
class="epics-details-filters filtered-search-block row-content-block second-block gl-flex gl-flex-col gl-px-5 gl-py-3 sm:gl-flex-row sm:gl-gap-3 xl:gl-px-6"
:class="{ 'gl-justify-end': viewOnly }"
>
<filtered-search-bar
v-if="!viewOnly"
:namespace="groupFullPath"
:tokens="getFilteredSearchTokens()"
:sort-options="$options.availableSortOptions"
......
......@@ -120,10 +120,11 @@ describe('RoadmapApp', () => {
);
describe('roadmap view', () => {
it('does not show filters UI when epicIid is present', () => {
it('disables search when epicIid is present', () => {
createComponent({ epicIid: '1' });
expect(findRoadmapFilters().exists()).toBe(false);
expect(findRoadmapFilters().exists()).toBe(true);
expect(findRoadmapFilters().props('viewOnly')).toBe(true);
});
it('shows roadmap filters UI when epicIid is not present', () => {
......
......@@ -47,6 +47,7 @@ describe('RoadmapFilters', () => {
let apolloProvider;
const createComponent = ({
props = {},
presetType = PRESET_TYPES.MONTHS,
epicsState = STATUS_ALL,
sortedBy = mockSortedBy,
......@@ -75,6 +76,9 @@ describe('RoadmapFilters', () => {
});
wrapper = shallowMountExtended(RoadmapFilters, {
propsData: {
...props,
},
provide: {
groupFullPath,
groupMilestonesPath,
......@@ -169,6 +173,14 @@ describe('RoadmapFilters', () => {
},
];
it('does not render FilteredSearchBar when the viewOnly prop is true', () => {
createComponent({
props: { viewOnly: true },
});
expect(findFilteredSearchBar().exists()).toBe(false);
});
it('component is rendered with correct namespace & recent search key', () => {
createComponent();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment