Commit 548d1fd1 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch 'ss/rm-enable-label-perma-links' into 'master'

Rm enableLabelPermalinks from components

See merge request gitlab-org/gitlab!80239
parents 3184daec b445dba8
...@@ -31,10 +31,6 @@ export default { ...@@ -31,10 +31,6 @@ export default {
type: Object, type: Object,
required: true, required: true,
}, },
enableLabelPermalinks: {
type: Boolean,
required: true,
},
labelFilterParam: { labelFilterParam: {
type: String, type: String,
required: false, required: false,
...@@ -142,11 +138,8 @@ export default { ...@@ -142,11 +138,8 @@ export default {
return label.title || label.name; return label.title || label.name;
}, },
labelTarget(label) { labelTarget(label) {
if (this.enableLabelPermalinks) { const value = encodeURIComponent(this.labelTitle(label));
const value = encodeURIComponent(this.labelTitle(label)); return `?${this.labelFilterParam}[]=${value}`;
return `?${this.labelFilterParam}[]=${value}`;
}
return '#';
}, },
/** /**
* This is needed as an independent method since * This is needed as an independent method since
......
...@@ -133,11 +133,6 @@ export default { ...@@ -133,11 +133,6 @@ export default {
required: false, required: false,
default: 2, default: 2,
}, },
enableLabelPermalinks: {
type: Boolean,
required: false,
default: true,
},
labelFilterParam: { labelFilterParam: {
type: String, type: String,
required: false, required: false,
...@@ -321,7 +316,6 @@ export default { ...@@ -321,7 +316,6 @@ export default {
:data-qa-issuable-title="issuable.title" :data-qa-issuable-title="issuable.title"
:issuable-symbol="issuableSymbol" :issuable-symbol="issuableSymbol"
:issuable="issuable" :issuable="issuable"
:enable-label-permalinks="enableLabelPermalinks"
:label-filter-param="labelFilterParam" :label-filter-param="labelFilterParam"
:show-checkbox="showBulkEditSidebar" :show-checkbox="showBulkEditSidebar"
:checked="issuableChecked(issuable)" :checked="issuableChecked(issuable)"
......
...@@ -13,7 +13,6 @@ Object { ...@@ -13,7 +13,6 @@ Object {
"currentPage": 1, "currentPage": 1,
"currentTab": "opened", "currentTab": "opened",
"defaultPageSize": 2, "defaultPageSize": 2,
"enableLabelPermalinks": true,
"error": "", "error": "",
"hasNextPage": false, "hasNextPage": false,
"hasPreviousPage": false, "hasPreviousPage": false,
......
...@@ -10,7 +10,6 @@ import { mockIssuable, mockRegularLabel, mockScopedLabel } from '../mock_data'; ...@@ -10,7 +10,6 @@ import { mockIssuable, mockRegularLabel, mockScopedLabel } from '../mock_data';
const createComponent = ({ const createComponent = ({
issuableSymbol = '#', issuableSymbol = '#',
issuable = mockIssuable, issuable = mockIssuable,
enableLabelPermalinks = true,
showCheckbox = true, showCheckbox = true,
slots = {}, slots = {},
} = {}) => } = {}) =>
...@@ -18,7 +17,6 @@ const createComponent = ({ ...@@ -18,7 +17,6 @@ const createComponent = ({
propsData: { propsData: {
issuableSymbol, issuableSymbol,
issuable, issuable,
enableLabelPermalinks,
showDiscussions: true, showDiscussions: true,
showCheckbox, showCheckbox,
}, },
...@@ -212,23 +210,13 @@ describe('IssuableItem', () => { ...@@ -212,23 +210,13 @@ describe('IssuableItem', () => {
}); });
describe('labelTarget', () => { describe('labelTarget', () => {
it('returns target string for a provided label param when `enableLabelPermalinks` is true', () => { it('returns target string for a provided label param', () => {
wrapper = createComponent(); wrapper = createComponent();
expect(wrapper.vm.labelTarget(mockRegularLabel)).toBe( expect(wrapper.vm.labelTarget(mockRegularLabel)).toBe(
'?label_name[]=Documentation%20Update', '?label_name[]=Documentation%20Update',
); );
}); });
it('returns string "#" for a provided label param when `enableLabelPermalinks` is false', async () => {
wrapper = createComponent({
enableLabelPermalinks: false,
});
await nextTick();
expect(wrapper.vm.labelTarget(mockRegularLabel)).toBe('#');
});
}); });
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment