Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add list filtering to lane editor. #50

Merged
merged 6 commits into from
Oct 3, 2022
Merged

Add list filtering to lane editor. #50

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e43f1c4
Add filter select to available lists on lane editor.
ray-lee Sep 28, 2022
ab7fc77
Update tests.
ray-lee Sep 29, 2022
4d12c84
Add tests.
ray-lee Sep 29, 2022
a26fd38
Remove extra whitespace.
ray-lee Sep 29, 2022
4bd8693
Add share icon to lists that are not owned.
ray-lee Sep 29, 2022
c5d9e93
Consolidate duplicate list info rendering code.
ray-lee Oct 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 56 additions & 3 deletions src/components/LaneCustomListsEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,19 @@ import * as React from "react";
import { DragDropContext, Droppable, Draggable } from "react-beautiful-dnd";
import { CustomListData } from "../interfaces";
import AddIcon from "./icons/AddIcon";
import ShareIcon from "./icons/ShareIcon";
import TrashIcon from "./icons/TrashIcon";
import GrabIcon from "./icons/GrabIcon";
import EditableInput from "./EditableInput";
import { Button } from "library-simplified-reusable-components";

export interface LaneCustomListsEditorProps
extends React.Props<LaneCustomListsEditor> {
allCustomLists: CustomListData[];
customListIds: number[];
filter?: string;
filteredCustomLists?: CustomListData[];
changeFilter?: (value: string) => void;
onUpdate?: (customListIds: number[]) => void;
}

Expand All @@ -22,6 +27,11 @@ export default class LaneCustomListsEditor extends React.Component<
LaneCustomListsEditorProps,
LaneCustomListsEditorState
> {
static defaultProps = {
filter: "owned",
filteredCustomLists: [],
};

constructor(props) {
super(props);
this.state = {
Expand All @@ -32,6 +42,38 @@ export default class LaneCustomListsEditor extends React.Component<
this.onDragEnd = this.onDragEnd.bind(this);
}

renderFilterSelect(): JSX.Element {
const filters = [
["All", ""],
["Owned", "owned"],
["Subscribed", "shared-in"],
];

return (
<fieldset>
<legend className="visuallyHidden">Select filter type</legend>

<EditableInput
elementType="select"
name="filter"
label="Show "
value={this.props.filter}
onChange={this.props.changeFilter}
>
{filters.map(([label, value]) => (
<option
key={value}
value={value}
aria-selected={this.props.filter === value}
>
{label}
</option>
))}
</EditableInput>
</fieldset>
);
}

render(): JSX.Element {
return (
<DragDropContext
Expand All @@ -42,6 +84,7 @@ export default class LaneCustomListsEditor extends React.Component<
<div className="available-lists">
<div className="droppable-header">
<h4>Available Lists ({this.listsNotInLane().length})</h4>
{this.renderFilterSelect()}
</div>
<Droppable
droppableId="available-lists"
Expand Down Expand Up @@ -75,7 +118,12 @@ export default class LaneCustomListsEditor extends React.Component<
>
<GrabIcon />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ll. 119-131 is duplicated below in ll. 188-200. Would it be useful to refactor?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. I extracted the duplicate code into its own function.

<div className="list-info">
<div className="list-name">{list.name}</div>
<div className="list-name">
{!list.is_owner && (
<ShareIcon title="This list is shared by another library." />
)}
{list.name}
</div>
<div className="list-count">
Items in list: {list.entry_count}
</div>
Expand Down Expand Up @@ -139,7 +187,12 @@ export default class LaneCustomListsEditor extends React.Component<
>
<GrabIcon />
<div className="list-info">
<div className="list-name">{list.name}</div>
<div className="list-name">
{!list.is_owner && (
<ShareIcon title="This list is shared by another library." />
)}
{list.name}
</div>
<div className="list-count">
Items in list: {list.entry_count}
</div>
Expand Down Expand Up @@ -176,7 +229,7 @@ export default class LaneCustomListsEditor extends React.Component<

listsNotInLane(): CustomListData[] {
const lists = [];
for (const list of this.props.allCustomLists || []) {
for (const list of this.props.filteredCustomLists || []) {
let found = false;
for (const listId of this.getCustomListIds()) {
if (list.id === listId) {
Expand Down
28 changes: 28 additions & 0 deletions src/components/LaneEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export interface LaneEditorProps extends React.Props<LaneEditor> {
}

export interface LaneEditorState {
filter: string;
name: string;
customListIds: number[];
inheritParentRestrictions: boolean;
Expand All @@ -39,13 +40,15 @@ export default class LaneEditor extends React.Component<
constructor(props) {
super(props);
this.state = {
filter: "owned",
name: this.props.lane && this.props.lane.display_name,
customListIds: (this.props.lane && this.props.lane.custom_list_ids) || [],
inheritParentRestrictions:
this.props.lane && this.props.lane.inherit_parent_restrictions,
};
this.changeName = this.changeName.bind(this);
this.changeCustomLists = this.changeCustomLists.bind(this);
this.changeFilter = this.changeFilter.bind(this);
this.changeInheritParentRestrictions = this.changeInheritParentRestrictions.bind(
this
);
Expand All @@ -56,6 +59,24 @@ export default class LaneEditor extends React.Component<
this.renderInfo = this.renderInfo.bind(this);
}

filterLists(lists?: CustomListData[]) {
lists = lists || this.props.customLists || [];

const { filter } = this.state;

let selectedFilter = null;

if (filter === "owned") {
selectedFilter = (list) => list.is_owner;
} else if (filter === "shared-in") {
selectedFilter = (list) => !list.is_owner;
} else if (filter === "shared-out") {
selectedFilter = (list) => list.is_owner && list.is_shared;
}

return selectedFilter ? lists.filter(selectedFilter) : lists;
}

render(): JSX.Element {
const parent = this.props.findParentOfLane(this.props.lane);
return (
Expand Down Expand Up @@ -116,6 +137,9 @@ export default class LaneEditor extends React.Component<
<LaneCustomListsEditor
allCustomLists={this.props.customLists}
customListIds={this.state.customListIds}
filter={this.state.filter}
filteredCustomLists={this.filterLists()}
changeFilter={this.changeFilter}
onUpdate={this.changeCustomLists}
ref={this.laneCustomListsRef}
/>
Expand Down Expand Up @@ -205,6 +229,10 @@ export default class LaneEditor extends React.Component<
this.setState(Object.assign({}, this.state, { customListIds }));
}

changeFilter(filter) {
this.setState({ filter });
}

changeInheritParentRestrictions() {
const inheritParentRestrictions = !this.state.inheritParentRestrictions;
this.setState(Object.assign({}, this.state, { inheritParentRestrictions }));
Expand Down
Loading