IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

web: components: disable empty group

Browse Source
This commit is contained in:
NikolayRechkin 2019-08-20 16:16:03 +03:00
parent 4556e44046
commit 86238cd64a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/ASC.Web.Components/src/components/search-input/index.js
View File

@ -284,6 +284,9 @@ class SearchInput extends React.Component {
if(!element.inSubgroup){
element.onClick = !element.isSeparator && !element.isHeader && !element.disabled ? ((e) => _this.onClickDropDownItem(e, element)) : undefined;
element.key = element.group != element.key ? element.group +"_"+ element.key : element.key;
if(element.subgroup != undefined){
if(d.findIndex(x => x.group === element.subgroup) == -1) element.disabled = true;
}
result.push(element);
}
});

6
web/ASC.Web.Storybook/stories/filter/base/base.filter.stories.js
View File

@ -19,7 +19,7 @@ function getData() {
{ key: '0', group: 'filter-type', label: 'Folders' },
{ key: '1', group: 'filter-type', label: 'Employee' },
{ key: 'filter-other', group: 'filter-other', label: 'Other', isHeader: true },
{ key: '0', group: 'filter-other', subgroup: 'filter-groups', label: 'Groups' },
{ key: '0', group: 'filter-other', subgroup: 'filter-groups', defaultSelectLabel: 'Select', label: 'Groups' },
{ key: '0', inSubgroup: true, group: 'filter-groups', label: 'Administration'},
{ key: '1', inSubgroup: true, group: 'filter-groups', label: 'Public Relations'},
];
@ -44,9 +44,7 @@ class FilterStory extends React.Component {
this.setState({
selectedFilterData: {
filterValue: [
{key: "0", group: "filter-status"},
{key: "1", group: "filter-type"},
{key: "1", group: "filter-groups"}
{key: "-1", group: "filter-groups"}
],
sortDirection: "asc",
sortId: "surname",

7
web/ASC.Web.Storybook/stories/input/search/index.stories.js
View File

@ -20,7 +20,8 @@ function getData() {
{ key: 'filter-other', group: 'filter-other', label: 'Other', isHeader: true },
{ key: '0', group: 'filter-other', subgroup: 'filter-groups', defaultSelectLabel: 'Select', label: 'Groups' },
{ key: '0', inSubgroup: true, group: 'filter-groups', label: 'Administration'},
{ key: '1', group: 'filter-other', subgroup: 'filter-test', defaultSelectLabel: 'Wählen', label: 'Test' },
{ key: '1', group: 'filter-other', subgroup: 'filter-empty', defaultSelectLabel: 'Select', label: 'Empty' },
{ key: '2', group: 'filter-other', subgroup: 'filter-test', defaultSelectLabel: 'Select', label: 'Test' },
{ key: '0', inSubgroup: true, group: 'filter-test', label: 'test1'},
{ key: '1', inSubgroup: true, group: 'filter-test', label: 'test2'},
@ -30,9 +31,7 @@ class SearchStory extends React.Component {
constructor(props) {
super(props);
this.state = {
selectedFilterData: [
]
selectedFilterData: []
};
this.buttonClick = this.buttonClick.bind(this);
}