Support multi-selection in file lists #1136

BoscoCHW · 2022-06-22T03:14:27Z

Fixes #379

Implement Control- and Shift-Click file selection
Shift-click behaviour is not ideal. Failed to simulate shift-click behaviour on Google Drive.
Issues:

Can't deselect when shift click direction changes

Other issues:

IStatusFile object equality checking leads to a lot of duplicate codes
File status changes is not immediately reflected in FileList state, leading to invalid commands in context menu

…le method

Shift-click behaviour is not ideal. Failed to simulate shift-click behaviour on Google Drive. Issues: 1. Can't deselect when shift click direction changes Other issues: 1. IStatusFile object equality checking leads to a lot of duplicate codes 2. File status changes is not immediately reflected in FileList state, leading to invalid commands in context menu

github-actions · 2022-06-22T03:14:45Z

👈 Launch a binder notebook on branch BoscoCHW/jupyterlab-git/issue-379

… to shift click

…egory (git status)

…a simple click, handle partially staged files for shift clicks

…lected files

…selected files

…pply to selected files

…into issue-379

BoscoCHW · 2022-06-24T23:44:15Z

@fcollonval
I think the multiple file selection for normal staging is complete. I just need to fix the tests. Please let me know if you want to make any changes to the code. Thank you!

fcollonval

Thanks a lot @BoscoCHW

I have a couple of suggestions - mainly related to API and algorithm simplification.

On Thursday, I will explain how to create integration tests for this PR.

src/components/FileList.tsx

src/components/FileItem.tsx

src/components/FileList.tsx

Use _isSelectedFile where appropriate

…normal staging

…aging

…e staging selecting all files

…iles for clarity

…code.

…reflect if all files are marked

fcollonval

Thanks

We are almost there. I have made some additional suggestions. And I found a bug. In simple staging mode, when clicking on a file item button the mark status changed (it should not). This can be solved by stopping the event propagation.

src/components/FileList.tsx

src/components/GitPanel.tsx

src/components/GitStage.tsx

src/components/SelectAllButton.tsx

ui-tests/README.md

ui-tests/tests/file-selection.spec.ts

Co-authored-by: Frédéric Collonval <fcollonval@users.noreply.github.com>

fcollonval

Let's add some doc strings then merge 😉

fcollonval · 2022-07-25T08:47:32Z

src/components/GitStage.tsx

@@ -41,6 +41,8 @@ export interface IGitStageProps {
   * Row renderer
   */
  rowRenderer: (props: ListChildComponentProps) => JSX.Element;
+


Suggested change

/**

* Optional select all element

*/

fcollonval · 2022-07-25T08:49:28Z

src/components/FileList.tsx

+    }
+  };
+
+  markUntilFile = (file: Git.IStatusFile): void => {


Suggested change

markUntilFile = (file: Git.IStatusFile): void => {

/**

* Mark files from the latest selected to this one

*

* @param file The current clicked-on file

*/

markUntilFile = (file: Git.IStatusFile): void => {

fcollonval · 2022-07-25T08:59:00Z

src/components/FileList.tsx

+   * @param file
+   * @param options


Suggested change

* @param file

* @param options

* @param file The current clicked-on file

* @param options Selection options

fcollonval · 2022-07-25T08:59:59Z

src/components/FileList.tsx

+    }
+  };
+
+  toggleAllFiles = (files: Git.IStatusFile[]): void => {


Suggested change

toggleAllFiles = (files: Git.IStatusFile[]): void => {

/**

* Set mark status from all selected button

*

* @param files Files to toggle

*/

toggleAllFiles = (files: Git.IStatusFile[]): void => {

fcollonval

Thanks a lot. Let's merge and release 😉

fcollonval · 2022-07-28T14:55:36Z

@all-contributors please add @BoscoCHW for code

allcontributors · 2022-07-28T14:55:45Z

@fcollonval

I've put up a pull request to add @BoscoCHW! 🎉

fcollonval · 2022-07-28T14:56:26Z

@all-contributors please add @iflinda for code

allcontributors · 2022-07-28T14:56:34Z

@fcollonval

I've put up a pull request to add @iflinda! 🎉

BoscoCHW added 5 commits June 20, 2022 12:09

enable multiple selection with control-click without functionality

e74a50b

Implemented multiple file selection with control-click

b6e5a58

Remove handling this.state.selectedFiles is null in FileList selectFi…

24e8b40

…le method

Enable toggle select/deselect files with control-click

3873908

extract file comparison logic and remove duplicate selected files due…

0c39912

… to shift click

BoscoCHW marked this pull request as ready for review June 22, 2022 20:56

BoscoCHW and others added 13 commits June 23, 2022 12:29

limit multiple file selection by control-click to within the same cat…

8ca54d6

…egory (git status)

rename replaceSelectedFile to selectOnlyOneFile for better comprehension

771b54c

shift-click on a file with a different category (git status) becomes …

8d9ebbc

…a simple click, handle partially staged files for shift clicks

Make FileItem action commands (open, diff and stage file) apply to se…

02255ba

…lected files

Make FileItem action commands (open, diff and unstage file) apply to …

daf70ca

…selected files

Make FileItem action commands (discarding changes and staging file) a…

0b8df08

…pply to selected files

fix bug - open correct files on clicking action button

b113c11

fix bug - diff correct files on clicking action button

3bba8ff

fix bug - unstage correct files on clicking action button

312ef19

fix bug - stage correct files on clicking action button

d747f65

fix bug - discard changes on correct files on clicking action button

36612e1

Merge branch 'jupyterlab:master' into issue-379

f085627

Merge branch 'issue-379' of https://github.com/BoscoCHW/jupyterlab-git …

3a24be0

…into issue-379

fix FileItem test

f6fc277

fcollonval changed the title ~~Issue 379~~ Support multi-selection in file lists Jun 27, 2022

fcollonval added the enhancement label Jun 27, 2022

fcollonval requested changes Jun 27, 2022

View reviewed changes

BoscoCHW added 4 commits June 27, 2022 11:34

Rename function filesAreEqual to areFilesEqual

6067f3b

Use _isSelectedFile where appropriate

Remove selectedFileStatus from state

794a8ac

change _openDiffViews function to async and await the execute command

925006e

Remove unnecessary code in openContextMenu

16f8d2b

BoscoCHW and others added 10 commits July 7, 2022 12:18

added simple ui tests for ctlr and shift click on file selection for …

48b38ca

…normal staging

Add skeleton code for implementing de/select all button for simple st…

a90ee9f

…aging

Fix original ui tests

1db6fa4

Changed file name in ui-tests README and have the select all in simpl…

2182835

…e staging selecting all files

Changed name of variables and function from markAllFile to toggleAllF…

71858cf

…iles for clarity

Added the ability to deselect items using select all

e9113fd

Simplified code in toggleAllFiles to use state and removed redundant …

efa5859

…code.

Improve mark-all button behaviour - sync checked state of the box to …

8d4c6b6

…reflect if all files are marked

Fix ui tests

b55a072

Add ui tests for simple staging

ad69888

fcollonval requested changes Jul 21, 2022

View reviewed changes

BoscoCHW and others added 7 commits July 21, 2022 12:14

Clear all signal connections when unmounting FileList

c1b9791

Co-authored-by: Frédéric Collonval <fcollonval@users.noreply.github.com>

Delete commented code in GitPanel

0688f2a

Co-authored-by: Frédéric Collonval <fcollonval@users.noreply.github.com>

Delete unused prop from interface (GitStage)

2f3acfa

Co-authored-by: Frédéric Collonval <fcollonval@users.noreply.github.com>

Improve consistency and fix bug

fae294f

fix ui test readme

b401781

Change control-click ui test to expect exactly 2 selected items

041c933

Stop propagation when users click on action buttons on FileItem

0184526

fcollonval requested changes Jul 25, 2022

View reviewed changes

BoscoCHW added 2 commits July 25, 2022 11:07

Add doc strings for functions

a5c100b

Document helper functions

95f6910

fcollonval approved these changes Jul 28, 2022

View reviewed changes

fcollonval merged commit 2091f48 into jupyterlab:master Jul 28, 2022

allcontributors bot mentioned this pull request Jul 28, 2022

docs: add BoscoCHW as a contributor for code #1154

Merged

allcontributors bot mentioned this pull request Jul 28, 2022

docs: add iflinda as a contributor for code #1155

Merged

fcollonval mentioned this pull request Aug 23, 2023

Delete multiple untracked files from left sidebar view #1111

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support multi-selection in file lists #1136

Support multi-selection in file lists #1136

BoscoCHW commented Jun 22, 2022 •

edited by fcollonval

Loading

github-actions bot commented Jun 22, 2022

BoscoCHW commented Jun 24, 2022

fcollonval left a comment

fcollonval left a comment

fcollonval left a comment

fcollonval Jul 25, 2022

fcollonval Jul 25, 2022

fcollonval Jul 25, 2022

fcollonval Jul 25, 2022

fcollonval left a comment

fcollonval commented Jul 28, 2022

allcontributors bot commented Jul 28, 2022

fcollonval commented Jul 28, 2022

allcontributors bot commented Jul 28, 2022

+/**
+ * Optional select all element
+ */

Support multi-selection in file lists #1136

Support multi-selection in file lists #1136

Conversation

BoscoCHW commented Jun 22, 2022 • edited by fcollonval Loading

github-actions bot commented Jun 22, 2022

BoscoCHW commented Jun 24, 2022

fcollonval left a comment

Choose a reason for hiding this comment

fcollonval left a comment

Choose a reason for hiding this comment

fcollonval left a comment

Choose a reason for hiding this comment

fcollonval Jul 25, 2022

Choose a reason for hiding this comment

fcollonval Jul 25, 2022

Choose a reason for hiding this comment

fcollonval Jul 25, 2022

Choose a reason for hiding this comment

fcollonval Jul 25, 2022

Choose a reason for hiding this comment

fcollonval left a comment

Choose a reason for hiding this comment

fcollonval commented Jul 28, 2022

allcontributors bot commented Jul 28, 2022

fcollonval commented Jul 28, 2022

allcontributors bot commented Jul 28, 2022

BoscoCHW commented Jun 22, 2022 •

edited by fcollonval

Loading