From e3dc339be3db23b2250880d13456eca95d28d6ce Mon Sep 17 00:00:00 2001 From: Chen-I Lim Date: Mon, 12 Oct 2020 08:57:49 -0700 Subject: [PATCH 1/2] WebSocket comments --- server/main/websockets.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/main/websockets.go b/server/main/websockets.go index 317d9a4e8..0316ac3fe 100644 --- a/server/main/websockets.go +++ b/server/main/websockets.go @@ -42,12 +42,14 @@ func (ws *WSServer) GetListeners(blockID string) []*websocket.Conn { return listeners } +// WSServer is a WebSocket server type WSServer struct { upgrader websocket.Upgrader listeners map[string][]*websocket.Conn mu sync.RWMutex } +// NewWSServer creates a new WSServer func NewWSServer() *WSServer { return &WSServer{ listeners: make(map[string][]*websocket.Conn), @@ -59,7 +61,7 @@ func NewWSServer() *WSServer { } } -// WebsocketMsg is send on block changes +// WebsocketMsg is sent on block changes type WebsocketMsg struct { Action string `json:"action"` BlockID string `json:"blockId"` From 87413c3ad9220e44b1e4af9a25cd1221acf03a03 Mon Sep 17 00:00:00 2001 From: Chen-I Lim Date: Mon, 12 Oct 2020 08:58:12 -0700 Subject: [PATCH 2/2] Text search --- src/client/boardPage.tsx | 5 ++++ src/client/boardTree.ts | 20 +++++++++++++ src/client/components/boardComponent.tsx | 38 +++++++++++++++++++++--- src/client/components/editable.tsx | 1 - src/client/components/tableComponent.tsx | 34 +++++++++++++++++++-- src/client/octoTypes.ts | 1 + 6 files changed, 92 insertions(+), 7 deletions(-) diff --git a/src/client/boardPage.tsx b/src/client/boardPage.tsx index c7334e3d5..8bb1334e3 100644 --- a/src/client/boardPage.tsx +++ b/src/client/boardPage.tsx @@ -227,6 +227,11 @@ class BoardPage implements IPageController { this.filterAnchorElement = ahchorElement this.render() } + + setSearchText(text?: string) { + this.boardTree.setSearchText(text) + this.render() + } } export { BoardPage } diff --git a/src/client/boardTree.ts b/src/client/boardTree.ts index 74c89dfbb..146a0ed2d 100644 --- a/src/client/boardTree.ts +++ b/src/client/boardTree.ts @@ -17,6 +17,7 @@ class BoardTree { activeView?: BoardView groupByProperty?: IPropertyTemplate + private searchText?: string private allCards: IBlock[] = [] get allBlocks(): IBlock[] { return [this.board, ...this.views, ...this.allCards] @@ -93,8 +94,18 @@ class BoardTree { this.applyFilterSortAndGroup() } + getSearchText(): string | undefined { + return this.searchText + } + + setSearchText(text?: string) { + this.searchText = text + this.applyFilterSortAndGroup() + } + applyFilterSortAndGroup() { this.cards = this.filterCards(this.allCards) + this.cards = this.searchFilterCards(this.cards) this.cards = this.sortCards(this.cards) if (this.activeView.groupById) { @@ -104,6 +115,15 @@ class BoardTree { } } + private searchFilterCards(cards: IBlock[]) { + const searchText = this.searchText?.toLocaleLowerCase() + if (!searchText) { return cards.slice() } + + return cards.filter(card => { + if (card.title?.toLocaleLowerCase().indexOf(searchText) !== -1) { return true } + }) + } + private setGroupByProperty(propertyId: string) { const { board } = this diff --git a/src/client/components/boardComponent.tsx b/src/client/components/boardComponent.tsx index 1b75c6ef3..ba5343b1c 100644 --- a/src/client/components/boardComponent.tsx +++ b/src/client/components/boardComponent.tsx @@ -25,15 +25,23 @@ type Props = { type State = { isHoverOnCover: boolean + isSearching: boolean } class BoardComponent extends React.Component { private draggedCard: IBlock private draggedHeaderOption: IPropertyOption + private searchFieldRef = React.createRef() constructor(props: Props) { super(props) - this.state = { isHoverOnCover: false } + this.state = { isHoverOnCover: false, isSearching: !!this.props.boardTree?.getSearchText() } + } + + componentDidUpdate(prevPros: Props, prevState: State) { + if (this.state.isSearching && !prevState.isSearching) { + this.searchFieldRef.current.focus() + } } render() { @@ -87,9 +95,18 @@ class BoardComponent extends React.Component {
{ this.groupByClicked(e) }}> Group by {boardTree.groupByProperty?.name}
-
{ this.filterClicked(e) }}>Filter
-
{ this.sortClicked(e) }}>Sort
-
Search
+
{ this.filterClicked(e) }}>Filter
+
{ this.sortClicked(e) }}>Sort
+ {this.state.isSearching + ? { this.searchChanged(text) }} + onKeyDown={(e) => { this.onSearchKeyDown(e) }}> + :
{ this.setState({ ...this.state, isSearching: true }) }}>Search
+ }
{ this.optionsClicked(e) }}>
{ this.addCard(undefined) }}>New
@@ -380,6 +397,19 @@ class BoardComponent extends React.Component { await mutator.changePropertyOptionOrder(board, boardTree.groupByProperty, draggedHeaderOption, destIndex) } } + + onSearchKeyDown(e: React.KeyboardEvent) { + if (e.keyCode === 27) { // ESC: Clear search + this.searchFieldRef.current.text = "" + this.setState({ ...this.state, isSearching: false }) + this.props.pageController.setSearchText(undefined) + e.preventDefault() + } + } + + searchChanged(text?: string) { + this.props.pageController.setSearchText(text) + } } export { BoardComponent } diff --git a/src/client/components/editable.tsx b/src/client/components/editable.tsx index 5b7b1e028..0c388ff55 100644 --- a/src/client/components/editable.tsx +++ b/src/client/components/editable.tsx @@ -102,7 +102,6 @@ class Editable extends React.Component { this.text = newText this.elementRef.current.classList.remove("active") - if (onBlur) { onBlur() } }} diff --git a/src/client/components/tableComponent.tsx b/src/client/components/tableComponent.tsx index a7328af42..bd05ea44c 100644 --- a/src/client/components/tableComponent.tsx +++ b/src/client/components/tableComponent.tsx @@ -23,16 +23,24 @@ type Props = { type State = { isHoverOnCover: boolean + isSearching: boolean } class TableComponent extends React.Component { private draggedHeaderTemplate: IPropertyTemplate private cardIdToRowMap = new Map>() private cardIdToFocusOnRender: string + private searchFieldRef = React.createRef() constructor(props: Props) { super(props) - this.state = { isHoverOnCover: false } + this.state = { isHoverOnCover: false, isSearching: !!this.props.boardTree?.getSearchText() } + } + + componentDidUpdate(prevPros: Props, prevState: State) { + if (this.state.isSearching && !prevState.isSearching) { + this.searchFieldRef.current.focus() + } } render() { @@ -83,7 +91,16 @@ class TableComponent extends React.Component {
{ this.propertiesClicked(e) }}>Properties
{ this.filterClicked(e) }}>Filter
{ this.sortClicked(e) }}>Sort
-
Search
+ {this.state.isSearching + ? { this.searchChanged(text) }} + onKeyDown={(e) => { this.onSearchKeyDown(e) }}> + :
{ this.setState({ ...this.state, isSearching: true }) }}>Search
+ }
this.optionsClicked(e)}>
{ this.addCard(true) }}>New
@@ -401,6 +418,19 @@ class TableComponent extends React.Component { const destIndex = template ? board.cardProperties.indexOf(template) : 0 await mutator.changePropertyTemplateOrder(board, draggedHeaderTemplate, destIndex) } + + onSearchKeyDown(e: React.KeyboardEvent) { + if (e.keyCode === 27) { // ESC: Clear search + this.searchFieldRef.current.text = "" + this.setState({ ...this.state, isSearching: false }) + this.props.pageController.setSearchText(undefined) + e.preventDefault() + } + } + + searchChanged(text?: string) { + this.props.pageController.setSearchText(text) + } } export { TableComponent } diff --git a/src/client/octoTypes.ts b/src/client/octoTypes.ts index 1a3f994c2..026046329 100644 --- a/src/client/octoTypes.ts +++ b/src/client/octoTypes.ts @@ -26,6 +26,7 @@ interface IPageController { showCard(card: IBlock): Promise showView(viewId: string): void showFilter(anchorElement?: HTMLElement): void + setSearchText(text?: string): void } export { IProperty, IBlock, IPageController }