-
-
Notifications
You must be signed in to change notification settings - Fork 558
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
XWIKI-18661: Impossible to filter panel type or category with empty v…
…alue (#1639) - Introduce a new 'empty' filter on Live Data - Introduce a new 'empty' matcher on Livetable - Make the conversion for the new filter on Live Data - Live Table Connector - Hides the select field in the advanced panel when the filter type is 'empty'
- Loading branch information
1 parent
f08993c
commit a5469d5
Showing
18 changed files
with
361 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
...-platform-livedata/xwiki-platform-livedata-webjar/src/main/tests/mocks/xwiki-selectize.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| /* | ||
| * See the NOTICE file distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU Lesser General Public License as | ||
| * published by the Free Software Foundation; either version 2.1 of | ||
| * the License, or (at your option) any later version. | ||
| * | ||
| * This software is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this software; if not, write to the Free | ||
| * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| * 02110-1301 USA, or see the FSF site: http://www.fsf.org. | ||
| */ |
92 changes: 92 additions & 0 deletions
92
...rm-livedata/xwiki-platform-livedata-webjar/src/main/tests/unit/filters/FilterList.spec.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| /* | ||
| * See the NOTICE file distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU Lesser General Public License as | ||
| * published by the Free Software Foundation; either version 2.1 of | ||
| * the License, or (at your option) any later version. | ||
| * | ||
| * This software is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this software; if not, write to the Free | ||
| * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| * 02110-1301 USA, or see the FSF site: http://www.fsf.org. | ||
| */ | ||
| import FilterList from "../../../filters/FilterList.vue"; | ||
| import {mount} from '@vue/test-utils'; | ||
| import _ from "lodash"; | ||
| import $ from "jquery"; | ||
|
|
||
| /** | ||
| * Initialize a FilterList component using default values vue test-utils `mount` parameters. | ||
| * The default parameters can be overridden using the `mountConfiguration` parameter. | ||
| * | ||
| * The default configuration is: | ||
| * ``` | ||
| * { | ||
| * provide: { | ||
| * logic: { | ||
| * getQueryFilterGroup() { | ||
| * return {}; | ||
| * }, | ||
| * onEventWhere() { | ||
| * }, | ||
| * getFilterDescriptor() { | ||
| * return {options: ''}; | ||
| * } | ||
| * } | ||
| * } | ||
| * } | ||
| * ``` | ||
| * | ||
| * @param mountConfiguration mount parameters merged over the default configuration | ||
| * @returns {{options: string}|{}|*} an initialized FilterList Vue component | ||
| */ | ||
| function initWrapper(mountConfiguration = {}) { | ||
| // Define an empty xwikiSelectize to prevent the component mount to fail. | ||
| $.fn.xwikiSelectize = () => { | ||
| }; | ||
|
|
||
| return mount(FilterList, _.merge({ | ||
| provide: { | ||
| logic: { | ||
| getQueryFilterGroup() { | ||
| return {}; | ||
| }, | ||
| onEventWhere() { | ||
| }, | ||
| getFilterDescriptor() { | ||
| return {options: ''}; | ||
| } | ||
| } | ||
| } | ||
| }, mountConfiguration)); | ||
| } | ||
|
|
||
| describe('FilterList.vue', () => { | ||
| it('Render the filter list when visible', () => { | ||
| const wrapper = initWrapper(); | ||
| expect(wrapper.html()).toBe("<span><input class=\"filter-list livedata-filter\"></span>") | ||
| }) | ||
|
|
||
| it('Render the filter list when Empty filter and advanced', () => { | ||
| const wrapper = initWrapper({ | ||
| propsData: {index: 0, isAdvanced: true}, | ||
| provide: { | ||
| logic: { | ||
| getQueryFilterGroup() { | ||
| return { | ||
| constraints: [{value: undefined, operator: 'empty'}] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }); | ||
| expect(wrapper.html()).toBe('<span style="display: none;"><input class="filter-list livedata-filter"></span>') | ||
| }) | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.