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

web: Moved AdvancedSelector2 from asc-web-components to asc-web-common

Browse Source
This commit is contained in:
Alexey Safronov 2019-12-10 10:32:26 +03:00
parent 3ead54b4e4
commit aeac729e52
12 changed files with 303 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
web/ASC.Web.Components/src/components/advanced-selector2/README.md → web/ASC.Web.Common/src/components/advanced-selector2/README.md
View File

4
web/ASC.Web.Components/src/components/advanced-selector2/advanced-selector2.stories.js → web/ASC.Web.Common/src/components/advanced-selector2/advanced-selector2.stories.js
View File

@ -13,9 +13,7 @@ import withReadme from "storybook-readme/with-readme";
import Readme from "./README.md";
import AdvancedSelector2 from "./";
import Section from "../../../.storybook/decorators/section";
import Button from "../button";
import Avatar from "../avatar";
import Text from "../text";
import {Button, Avatar, Text} from "asc-web-components";
import isEqual from "lodash/isEqual";
import { name, image, internet } from "faker";

6
web/ASC.Web.Components/src/components/advanced-selector2/index.js → web/ASC.Web.Common/src/components/advanced-selector2/index.js
View File

@ -1,12 +1,10 @@
import React from "react";
import PropTypes from "prop-types";
import DropDown from "../drop-down";
import Aside from "../layout/sub-components/aside";
import ADSelector from "./sub-components/selector";
import Backdrop from "../backdrop";
import { desktop } from "../../utils/device";
import { utils, Backdrop, DropDown, Aside } from "asc-web-components";
import throttle from "lodash/throttle";
import onClickOutside from "react-onclickoutside";
const { desktop } = utils.device;
const displayTypes = ["dropdown", "aside", "auto"];
const sizes = ["compact", "full"];

0
web/ASC.Web.Components/src/components/advanced-selector2/sub-components/body.js → web/ASC.Web.Common/src/components/advanced-selector2/sub-components/body.js
View File

0
web/ASC.Web.Components/src/components/advanced-selector2/sub-components/column.js → web/ASC.Web.Common/src/components/advanced-selector2/sub-components/column.js
View File

2
web/ASC.Web.Components/src/components/advanced-selector2/sub-components/footer.js → web/ASC.Web.Common/src/components/advanced-selector2/sub-components/footer.js
View File

@ -1,6 +1,6 @@
import React from "react";
import PropTypes from "prop-types";
import Button from "../../button";
import { Button } from "asc-web-components";
import styled, { css } from "styled-components";
const StyledContainer = styled.div`

0
web/ASC.Web.Components/src/components/advanced-selector2/sub-components/header.js → web/ASC.Web.Common/src/components/advanced-selector2/sub-components/header.js
View File

204
web/ASC.Web.Components/src/components/advanced-selector2/sub-components/selector.js → web/ASC.Web.Common/src/components/advanced-selector2/sub-components/selector.js
View File

@ -1,14 +1,6 @@
import React, { useRef, useState, useEffect } from "react";
import PropTypes from "prop-types";
import styled, { css } from "styled-components";
import Checkbox from "../../checkbox";
import Link from "../../link";
import ComboBox from "../../combobox";
import SearchInput from "../../search-input";
import Loader from "../../loader";
import Text from "../../text";
import Tooltip from "../../tooltip";
import CustomScrollbarsVirtualList from "../../scrollbar/custom-scrollbars-virtual-list";
import ADSelectorColumn from "./column";
import ADSelectorFooter from "./footer";
import ADSelectorHeader from "./header";
@ -17,13 +9,28 @@ import { FixedSizeList as List } from "react-window";
import InfiniteLoader from "react-window-infinite-loader";
import AutoSizer from "react-virtualized-auto-sizer";
import ReactTooltip from "react-tooltip";
import HelpButton from "../../help-button";
import {
Checkbox,
Link,
ComboBox,
SearchInput,
Loader,
Text,
Tooltip,
CustomScrollbarsVirtualList,
HelpButton
} from "asc-web-components";
/* eslint-disable no-unused-vars */
/* eslint-disable react/prop-types */
const Container = ({ displayType, options, groups, isMultiSelect, hasSelected, ...props }) => (
<div {...props} />
);
const Container = ({
displayType,
options,
groups,
isMultiSelect,
hasSelected,
...props
}) => <div {...props} />;
/* eslint-enable react/prop-types */
/* eslint-enable no-unused-vars */
@ -69,7 +76,7 @@ const StyledContainer = styled(Container)`
padding-left: 8px;
.group_checkbox {
display: inline-block;
display: inline-block;
}
}
}
@ -78,13 +85,16 @@ const StyledContainer = styled(Container)`
: css`
height: 100%;
grid-template-columns: 1fr;
${props => props.isMultiSelect && props.hasSelected
? css`
grid-template-rows: 0.98fr 69px;
grid-template-areas: "column-options" "footer";`
: css`
grid-template-rows: 0.98fr;
grid-template-areas: "column-options";`}
${props =>
props.isMultiSelect && props.hasSelected
? css`
grid-template-rows: 0.98fr 69px;
grid-template-areas: "column-options" "footer";
`
: css`
grid-template-rows: 0.98fr;
grid-template-areas: "column-options";
`}
`}
.column-options {
@ -96,38 +106,58 @@ const StyledContainer = styled(Container)`
grid-row-gap: 16px;
grid-template-columns: 1fr;
grid-template-rows: ${props => props.displayType === "aside"
? (props.isMultiSelect && props.options && props.options.length > 0 ? (props.groups && props.groups.length ? "100px" : "30px") : "70px")
: "30px"} 0.98fr;
grid-template-rows: ${props =>
props.displayType === "aside"
? props.isMultiSelect && props.options && props.options.length > 0
? props.groups && props.groups.length
? "100px"
: "30px"
: "70px"
: "30px"} 0.98fr;
grid-template-areas: "header-options" "body-options";
.header-options {
grid-area: header-options;
/* background-color: white; */
${props => props.displayType === "aside" && css`
display: grid;
grid-row-gap: 12px;
grid-template-columns: 1fr;
grid-template-rows: 30px 30px ${props => props.isMultiSelect && props.options && props.options.length > 0 && "30px"};
${props => props.isMultiSelect && props.options && props.options.length > 0
? css`grid-template-areas: "options_searcher" "options_group_selector" "options_group_select_all";`
: css`grid-template-areas: "options_searcher" "options_group_selector";`}
${props =>
props.displayType === "aside" &&
css`
display: grid;
grid-row-gap: 12px;
grid-template-columns: 1fr;
grid-template-rows: 30px 30px ${props =>
props.isMultiSelect &&
props.options &&
props.options.length > 0 &&
"30px"};
${props =>
props.isMultiSelect && props.options && props.options.length > 0
? css`
grid-template-areas: "options_searcher" "options_group_selector" "options_group_select_all";
`
: css`
grid-template-areas: "options_searcher" "options_group_selector";
`}
.options_searcher {
grid-area: options_searcher;
}
.options_group_selector {
grid-area: options_group_selector;
}
${props => props.isMultiSelect && props.options && props.options.length > 0 && css`
.options_group_select_all {
grid-area: options_group_select_all;
.options_searcher {
grid-area: options_searcher;
}
.options_group_selector {
grid-area: options_group_selector;
}
${props =>
props.isMultiSelect &&
props.options &&
props.options.length > 0 &&
css`
.options_group_select_all {
grid-area: options_group_select_all;
}
`}
`}
`}
}
.body-options {
@ -191,8 +221,8 @@ const ADSelector = props => {
size
} = props;
//console.log("options", options);
//console.log("hasNextPage", hasNextPage);
//console.log("options", options);
//console.log("hasNextPage", hasNextPage);
//console.log("isNextPageLoading", isNextPageLoading);
const listOptionsRef = useRef(null);
@ -200,7 +230,7 @@ const ADSelector = props => {
useEffect(() => {
resetCache();
}, [searchValue, currentGroup, hasNextPage])
}, [searchValue, currentGroup, hasNextPage]);
const [selectedOptionList, setSelectedOptionList] = useState(
selectedOptions || []
@ -251,8 +281,7 @@ const ADSelector = props => {
: selectedOptionList.filter(el => el.key !== option.key);
setSelectedOptionList(newSelected);
if(!option.groups)
return;
if (!option.groups) return;
const newSelectedGroups = [];
const removedSelectedGroups = [];
@ -271,8 +300,7 @@ const ADSelector = props => {
);
} else {
index = groups.findIndex(sg => sg.key === g);
if(index < 0)
return;
if (index < 0) return;
const notSelectedGroup = convertGroup(groups[index]);
newSelectedGroups.push(
Object.assign({}, notSelectedGroup, {
@ -348,29 +376,26 @@ const ADSelector = props => {
};
const onGroupSelect = group => {
if(!currentGroup || !group || currentGroup.key === group.key)
return;
if (!currentGroup || !group || currentGroup.key === group.key) return;
setCurrentGroup(group);
onGroupChanged && onGroupChanged(group);
if(displayType === "aside" && isMultiSelect) {
if (displayType === "aside" && isMultiSelect) {
setSelectedAll(isGroupChecked(group));
}
};
const onSelectAllChange = () => {
const checked = !selectedAll
const checked = !selectedAll;
//console.log("onSelectAllChange", checked);
setSelectedAll(checked);
if(!currentGroup)
return;
if (!currentGroup) return;
const group = convertGroup(currentGroup);
if(!group)
return;
if (!group) return;
group.selected = checked ? group.total : 0;
const newSelectedGroups = checked
@ -378,7 +403,7 @@ const ADSelector = props => {
: selectedGroupList.filter(el => el.key !== group.key);
setSelectedGroupList(newSelectedGroups);
}
};
const onSearchChange = value => {
setSearchValue(value);
@ -396,33 +421,32 @@ const ADSelector = props => {
const isOptionChecked = option => {
const checked =
selectedOptionList.findIndex(el => el.key === option.key) > -1 ||
option.groups && option.groups.filter(gKey => {
const selectedGroup = selectedGroupList.find(sg => sg.key === gKey);
(option.groups &&
option.groups.filter(gKey => {
const selectedGroup = selectedGroupList.find(sg => sg.key === gKey);
if (!selectedGroup) return false;
if (!selectedGroup) return false;
return selectedGroup.total === selectedGroup.selected;
}).length > 0;
return selectedGroup.total === selectedGroup.selected;
}).length > 0);
return checked;
};
const onLinkClick = (e) => {
const onLinkClick = e => {
const index = e.target.dataset.index;
if(!index)
return;
if (!index) return;
const option = options[index];
if(!option)
return;
if (!option) return;
onSelectOptions([option])
}
onSelectOptions([option]);
};
const onAddClick = () => {
onSelectOptions(selectedOptionList)
}
onSelectOptions(selectedOptionList);
};
// Render an item or a loading indicator.
// eslint-disable-next-line react/prop-types
@ -526,16 +550,16 @@ const ADSelector = props => {
return isMultiSelect
? `${group.label} (${group.total}/${selected})`
: group.label;
}
};
const getSelectorGroups = groups => {
return groups.map(group => {
return {
...group,
label: getGroupLabel(group)
}
})
}
};
});
};
// eslint-disable-next-line react/prop-types
const renderGroup = ({ index, style }) => {
@ -593,8 +617,7 @@ const ADSelector = props => {
console.log("loadMoreItems", options);
loadNextPage &&
loadNextPage(options);
loadNextPage && loadNextPage(options);
};
return (
@ -605,7 +628,11 @@ const ADSelector = props => {
isMultiSelect={isMultiSelect}
hasSelected={hasSelected()}
>
<ADSelectorColumn className="column-options" displayType={displayType} size={size}>
<ADSelectorColumn
className="column-options"
displayType={displayType}
size={size}
>
<ADSelectorHeader className="header-options">
<SearchInput
className="options_searcher"
@ -676,24 +703,23 @@ const ADSelector = props => {
</Text>
</div>
)}
{getOptionTooltipContent &&
{getOptionTooltipContent && (
<Tooltip
id="user"
offsetRight={90}
getContent={getOptionTooltipContent}
/>
}
)}
</ADSelectorBody>
</ADSelectorColumn>
{displayType === "dropdown" && groups && groups.length > 0 && (
<ADSelectorColumn className="column-groups" displayType={displayType} size={size}>
<ADSelectorColumn
className="column-groups"
displayType={displayType}
size={size}
>
<ADSelectorHeader className="header-groups">
<Text
as="p"
className="group_header"
fontSize={15}
isBold={true}
>
<Text as="p" className="group_header" fontSize={15} isBold={true}>
{groupsHeaderLabel}
</Text>
</ADSelectorHeader>

2
web/ASC.Web.Common/src/components/group-selector/index.js
View File

@ -1,6 +1,6 @@
import React from "react";
import PropTypes from "prop-types";
import { AdvancedSelector2 } from "asc-web-components";
import AdvancedSelector2 from "../advanced-selector2";
import { getGroupList } from "../../api/groups";
import { setClientBasePath } from "../../api/client";

3
web/ASC.Web.Common/src/components/index.js
View File

@ -4,4 +4,5 @@ export { default as Login } from "./login";
export { default as StudioLayout } from "./layout";
export { default as ModuleTile } from "./module-tile";
export { default as PeopleSelector } from "./people-selector";
export { default as GroupSelector } from "./group-selector";
export { default as GroupSelector } from "./group-selector";
export { default as AdvancedSelector2 } from './advanced-selector2'

361
web/ASC.Web.Common/src/components/people-selector/index.js
View File

@ -1,210 +1,209 @@
import React from "react";
import PropTypes from "prop-types";
import { AdvancedSelector2, Avatar, Text } from "asc-web-components";
import { Avatar, Text } from "asc-web-components";
import AdvancedSelector2 from "../advanced-selector2";
import { getUserList } from "../../api/people";
import { getGroupList } from "../../api/groups";
import Filter from "../../api/people/filter";
import { setClientBasePath } from "../../api/client";
class PeopleSelector extends React.Component {
constructor(props) {
super(props);
constructor(props) {
super(props);
const { isOpen } = props;
this.state = this.getDefaultState(isOpen, []);
}
componentDidMount() {
const PREFIX = "api";
const VERSION = "2.0";
const baseURL = `http://localhost:8092/${PREFIX}/${VERSION}`;
setClientBasePath(baseURL);
const { isOpen } = props;
this.state = this.getDefaultState(isOpen, []);
}
getGroupList(this.props.useFake)
.then((groups) => this.setState({groups: [{
key: "all",
label: "All groups",
componentDidMount() {
const PREFIX = "api";
const VERSION = "2.0";
const baseURL = `http://localhost:8092/${PREFIX}/${VERSION}`;
setClientBasePath(baseURL);
getGroupList(this.props.useFake)
.then(groups =>
this.setState({
groups: [
{
key: "all",
label: "All groups",
total: 0
}
].concat(this.convertGroups(groups))
})
)
.catch(error => console.log(error));
}
componentDidUpdate(prevProps) {
if (this.props.isOpen !== prevProps.isOpen)
this.setState({ isOpen: this.props.isOpen });
}
convertGroups = groups => {
return groups
? groups.map(g => {
return {
key: g.id,
label: g.name,
total: 0
}].concat(this.convertGroups(groups))}))
.catch((error) => console.log(error));
}
};
})
: [];
};
componentDidUpdate(prevProps) {
if(this.props.isOpen !== prevProps.isOpen)
this.setState({ isOpen: this.props.isOpen });
}
convertUsers = users => {
return users
? users.map(u => {
return {
key: u.id,
groups: u.groups || [],
label: u.displayName,
email: u.email,
position: u.title,
avatarUrl: u.avatar
};
})
: [];
};
convertGroups = groups => {
return groups
? groups.map(g => {
return {
key: g.id,
label: g.name,
total: 0
};
})
: [];
};
loadNextPage = ({ startIndex, searchValue, currentGroup }) => {
console.log(
`loadNextPage(startIndex=${startIndex}, searchValue="${searchValue}", currentGroup="${currentGroup}")`
);
convertUsers = users => {
return users
? users.map(u => {
return {
key: u.id,
groups: u.groups || [],
label: u.displayName,
email: u.email,
position: u.title,
avatarUrl: u.avatar
};
})
: [];
};
const pageCount = 100;
loadNextPage = ({ startIndex, searchValue, currentGroup }) => {
console.log(
`loadNextPage(startIndex=${startIndex}, searchValue="${searchValue}", currentGroup="${currentGroup}")`
);
this.setState({ isNextPageLoading: true }, () => {
const filter = Filter.getDefault();
filter.page = startIndex / pageCount;
filter.pageCount = pageCount;
const pageCount = 100;
if (searchValue) filter.search = searchValue;
this.setState({ isNextPageLoading: true }, () => {
const filter = Filter.getDefault();
filter.page = startIndex/pageCount;
filter.pageCount = pageCount;
if (currentGroup && currentGroup !== "all") filter.group = currentGroup;
if(searchValue)
filter.search = searchValue;
getUserList(filter, this.props.useFake)
.then(response => {
const newOptions = (startIndex ? [...this.state.options] : []).concat(
this.convertUsers(response.items)
);
if(currentGroup && currentGroup !== "all")
filter.group = currentGroup;
this.setState({
hasNextPage: newOptions.length < response.total,
isNextPageLoading: false,
options: newOptions
});
})
.catch(error => console.log(error));
});
};
getUserList(filter, this.props.useFake)
.then((response) => {
getDefaultState = (isOpen, groups) => {
return {
isOpen: isOpen,
options: [],
groups,
page: 0,
hasNextPage: true,
isNextPageLoading: false
};
};
const newOptions = (startIndex ? [...this.state.options] : []).concat(this.convertUsers(response.items));
getOptionTooltipContent = index => {
if (!index) return null;
this.setState({
hasNextPage: newOptions.length < response.total,
isNextPageLoading: false,
options: newOptions
});
})
.catch((error) => console.log(error));
});
};
const { options } = this.state;
getDefaultState = (isOpen, groups) => {
return {
isOpen: isOpen,
options: [],
groups,
page: 0,
hasNextPage: true,
isNextPageLoading: false
};
};
const user = options[+index];
getOptionTooltipContent = index => {
if (!index) return null;
if (!user) return null;
const { options } = this.state;
// console.log("onOptionTooltipShow", index, user);
const user = options[+index];
return (
<div
style={{
width: 253,
minHeight: 63,
display: "grid",
gridTemplateColumns: "30px 1fr",
gridTemplateRows: "1fr",
gridColumnGap: 8
}}
>
<Avatar
size="small"
role="user"
source={user.avatarUrl}
userName=""
editing={false}
/>
<div>
<Text isBold={true} fontSize={16}>
{user.label}
</Text>
<Text color="#A3A9AE" fontSize={13} style={{ paddingBottom: 8 }}>
{user.email}
</Text>
<Text fontSize={13}>{user.position}</Text>
</div>
</div>
);
};
if (!user) return null;
render() {
const {
isOpen,
options,
groups,
selectedOptions,
selectedGroups,
hasNextPage,
isNextPageLoading,
size
} = this.state;
// console.log("onOptionTooltipShow", index, user);
const { isMultiSelect, isDisabled, onSelect } = this.props;
return (
<div
style={{
width: 253,
minHeight: 63,
display: "grid",
gridTemplateColumns: "30px 1fr",
gridTemplateRows: "1fr",
gridColumnGap: 8
}}
>
<Avatar
size="small"
role="user"
source={user.avatarUrl}
userName=""
editing={false}
/>
<div>
<Text isBold={true} fontSize={16}>
{user.label}
</Text>
<Text
color="#A3A9AE"
fontSize={13}
style={{ paddingBottom: 8 }}
>
{user.email}
</Text>
<Text fontSize={13}>{user.position}</Text>
</div>
</div>
);
};
render() {
const {
isOpen,
options,
groups,
selectedOptions,
selectedGroups,
hasNextPage,
isNextPageLoading,
size
} = this.state;
const {
isMultiSelect,
isDisabled,
onSelect
} = this.props;
return (
<AdvancedSelector2
options={options}
groups={groups}
hasNextPage={hasNextPage}
isNextPageLoading={isNextPageLoading}
loadNextPage={this.loadNextPage}
size={size}
displayType={"auto"}
selectedOptions={selectedOptions}
selectedGroups={selectedGroups}
isOpen={isOpen}
isMultiSelect={isMultiSelect}
isDisabled={isDisabled}
searchPlaceHolderLabel={"Search users"}
selectButtonLabel={"Add members"}
selectAllLabel={"Select all"}
groupsHeaderLabel={"Groups"}
emptySearchOptionsLabel={"There are no users with such name"}
emptyOptionsLabel={"There are no users"}
loadingLabel={'Loading... Please wait...'}
onSelect={onSelect}
onSearchChanged={() => {
//action("onSearchChanged")(value);
this.setState({ options: [], hasNextPage: true });
}}
onGroupChanged={() => {
//action("onGroupChanged")(group);
this.setState({ options: [], hasNextPage: true });
}}
getOptionTooltipContent={this.getOptionTooltipContent}
onCancel={() => {
this.setState({ isOpen: false });
}}
/>);
}
return (
<AdvancedSelector2
options={options}
groups={groups}
hasNextPage={hasNextPage}
isNextPageLoading={isNextPageLoading}
loadNextPage={this.loadNextPage}
size={size}
displayType={"auto"}
selectedOptions={selectedOptions}
selectedGroups={selectedGroups}
isOpen={isOpen}
isMultiSelect={isMultiSelect}
isDisabled={isDisabled}
searchPlaceHolderLabel={"Search users"}
selectButtonLabel={"Add members"}
selectAllLabel={"Select all"}
groupsHeaderLabel={"Groups"}
emptySearchOptionsLabel={"There are no users with such name"}
emptyOptionsLabel={"There are no users"}
loadingLabel={"Loading... Please wait..."}
onSelect={onSelect}
onSearchChanged={() => {
//action("onSearchChanged")(value);
this.setState({ options: [], hasNextPage: true });
}}
onGroupChanged={() => {
//action("onGroupChanged")(group);
this.setState({ options: [], hasNextPage: true });
}}
getOptionTooltipContent={this.getOptionTooltipContent}
onCancel={() => {
this.setState({ isOpen: false });
}}
/>
);
}
}
PeopleSelector.propTypes = {
@ -213,11 +212,11 @@ PeopleSelector.propTypes = {
isMultiSelect: PropTypes.bool,
isDisabled: PropTypes.bool,
size: PropTypes.oneOf(["full", "compact"])
}
};
PeopleSelector.defaultProps = {
useFake: false,
size: "full"
}
};
export default PeopleSelector;
export default PeopleSelector;

2
web/ASC.Web.Components/src/index.js
View File

@ -51,7 +51,6 @@ export { default as EmptyScreenContainer} from './components/empty-screen-contai
export { default as CustomScrollbarsVirtualList } from './components/scrollbar/custom-scrollbars-virtual-list'
export { default as RowContent } from './components/row-content'
export { default as Calendar } from './components/calendar'
export { default as AdvancedSelector2 } from './components/advanced-selector2'
export { default as ContextMenu } from './components/context-menu'
export { default as RowContainer } from './components/row-container'
export { default as FieldContainer } from './components/field-container'
@ -61,3 +60,4 @@ export { default as PasswordInput } from './components/password-input'
export { default as Tooltip } from './components/tooltip'
export { default as HelpButton } from './components/help-button'
export { default as EmailInput } from './components/email-input'
export { default as Aside } from "./components/layout/sub-components/aside"