fork/cellxgene
1
0
Fork 0
mirror of https://github.com/chanzuckerberg/cellxgene.git synced 2026-10-10 20:20:56 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,470 Commits 22 Branches 50 Tags
21d1ca1bc893111b465e086718d5c07e8e93cde5
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Megill 21d1ca1bc8 Merge branch 'main' into colinmegill/geneset-prototype 2021-03-05 16:14:49 -08:00
Colin Megill 012ce53521 remove logging 2021-03-05 15:34:47 -08:00
Colin Megill db957c5de3 gene set button text typo 2021-02-25 12:12:43 -08:00
Colin Megill a01df1151d truncate uses tooltip2 2021-02-25 12:11:38 -08:00
Colin Megill 2953687489 add popper2 
upgrade react popper
upgrade react popper
adding popover2 package
 2021-02-24 14:10:30 -08:00
Colin Megill dd26addf6f copy correction 2021-02-24 00:45:46 -08:00
Colin Megill 16a0e08250 fix language on create 2021-02-22 09:43:49 -08:00
Colin Megill f5e13d0a71 edit geneset 2021-02-11 00:23:11 -08:00
Colin Megill 9170653296 handle empty string case on genes for create geneset 2021-02-10 16:35:20 -08:00
Colin Megill 4379427a40 Merge remote-tracking branch 'origin/colinmegill/geneset-prototype' into colinmegill/geneset-prototype 2021-02-10 11:27:25 -08:00
Colin Megill ac475d72d9 chevron after 2021-02-10 11:26:50 -08:00
Colin Megill e8f0a1d2cb icons, language consistency 2021-02-10 11:22:36 -08:00
Colin Megill fec1736820 prepopulate geneset with genes from modal 2021-01-28 15:07:31 -08:00
Colin Megill 84fcbb8652 handle delete gene from set 2021-01-28 13:54:32 -08:00
Colin Megill 9760277642 prototype: remove csv upload placeholder 2021-01-28 10:34:20 -08:00
Colin Megill 7c0569b9b6 add geneset, add gene, delete set 2021-01-27 13:05:48 -08:00
Colin Megill 996393f260 Merge remote-tracking branch 'origin/colinmegill/geneset-prototype' into colinmegill/geneset-prototype 2021-01-22 12:09:26 -08:00
Colin Megill c6ad970c41 add gene modals 2021-01-22 12:09:22 -08:00
Colin Megill d1e117ebb9 Merge branch 'main' into colinmegill/geneset-prototype 2021-01-12 13:35:46 -08:00
Colin Megill 8248fce412 Merge branch 'main' into colinmegill/geneset-prototype 2020-12-08 14:51:22 -08:00
Colin Megill 0a9a78bd85 merge main 2020-12-03 15:25:49 -08:00
Colin Megill 36939d99fa geneset show mean expression 2020-11-17 12:55:17 -08:00
Colin Megill 0ee62a86a0 render diffexp as geneset 2020-11-17 12:42:16 -08:00
Colin Megill a9665df7e7 move create category to top 2020-11-17 12:13:02 -08:00
Colin Megill f1d53d6dc4 don't clear diffexp on subset 2020-11-17 12:04:23 -08:00
Colin Megill db4ac5e1e5 bump number of genes to 50 2020-11-17 11:23:13 -08:00
Colin Megill 6f23f1e7e5 mini 2020-10-06 17:32:05 -07:00
Colin Megill 04a3c3c6b6 Partial fix for 1830 (#1863) 
* Remove door icon from log in button
* Move log in and info buttons from the top bar to in line with the cellxgene icon and dataset name
* Hover over on login button should say "Log in to cellxgene"
* Show email

closes #1830
 2020-09-30 11:45:10 -07:00
Colin Megill 86d369e63e toggleable 2020-09-29 11:17:40 -07:00
Colin Megill 77c44af0b1 expand button 2020-09-28 23:03:13 -07:00
Colin Megill 274298484c add isExpanded state to gene, and pass to histogram 2020-09-28 16:11:52 -07:00
Colin Megill 5b846e5dfa remove have fetched 2020-09-28 16:11:20 -07:00
Colin Megill 8f94736956 test data 2020-09-28 12:48:53 -07:00
Colin Megill 58e81ba020 re-add isuserdefined 2020-09-22 13:55:37 -07:00
Colin Megill c93c5a375c reenable add genes 2020-09-21 17:51:34 -07:00
Colin Megill 56c5124c39 componetize histogram 2020-09-21 14:51:39 -07:00
Colin Megill 7324cebc84 remove heatmap mock 2020-09-15 13:18:31 -07:00
Colin Megill ab8d4a440a Merge branch 'main' into colinmegill/geneset-prototype 2020-09-15 13:13:40 -07:00
Colin Megill 558b68d0d5 geneset dialogue stub 2020-08-31 13:59:40 -04:00
Colin Megill 5a8ebef0d0 menus and buttons 2020-08-26 21:02:33 -04:00
Colin Megill 8befeda444 Merge branch 'main' into colinmegill/geneset-prototype 2020-08-25 16:17:49 -04:00
Colin Megill 9f03491094 color by geneset stub 2020-08-25 15:21:42 -04:00
Colin Megill cc6416168b mock reducer 2020-08-17 16:36:12 -04:00
Colin Megill 4ad9f5875a xx, yy (#1754) 2020-08-17 11:55:49 -04:00
Colin Megill bef631396c Merge branch 'main' into colinmegill/geneset-prototype 2020-08-17 10:49:57 -04:00
Colin Megill c913935d90 Login / Logout button (#1718) 
* first pass auth button

* only pop anno dialogue if authenticated

* add config to ignore

* remove config
 2020-08-06 14:39:58 -04:00
Colin Megillandbkmartinjr 03bad04436 Embedding button to lower left, cell selection (#1658) 
* embedding

* menu bottom left

* button

* change gutters to support lower toolbar

* fix scatterplot layout

* fix tests to match new layout

* fix smoke tests to match new layout

* better sentence, dataset.nObs to top

* scatterplot position

Co-authored-by: bkmartinjr <bruce@chanzuckerberg.com>
 2020-07-22 18:48:21 -04:00
Colin Megill adb0b65058 Merge branch 'main' into colinmegill/geneset-prototype 2020-07-20 12:15:11 -04:00
Colin MegillandSeveriano Badajoz 77ffa0712e If min / max are the same, hide histo + legend, show value (#1554) 
* hide legend, histo single value

* display block

* extra check for domain

* Update client/src/components/continuousLegend/index.js

Co-authored-by: Severiano Badajoz <sbadajoz@chanzuckerberg.com>

* readability on variables, use clipped ranges

Co-authored-by: Severiano Badajoz <sbadajoz@chanzuckerberg.com>
 2020-06-11 16:27:02 -04:00
Colin Megill 627d28f654 Merge branch 'master' into colinmegill/geneset-prototype 2020-06-08 16:24:52 -04:00
Colin Megill bc5b01da0f Break out anno plus button (#1473) 
* break out plus button

* remove menu item

* padding, remove icon

* icon padding
 2020-05-20 16:22:29 -04:00
Colin Megill e93031346f remove unused import 2020-05-20 15:57:43 -04:00
Colin Megill 708499c1fd Merge branch 'master' into colinmegill/geneset-prototype 2020-05-19 15:58:36 -04:00
Colin Megill 5fc76edf2d Factor adding genes into own component (#1480) 
* factor out add genes to own component

* correct import
 2020-05-19 11:41:49 -04:00
Colin Megill 7551118800 factor out add genes to own component 2020-05-18 15:58:14 -04:00
Colin Megill 2c7bfdb2cc Merge remote-tracking branch 'origin/colinmegill/geneset-prototype' into colinmegill/geneset-prototype 2020-05-11 13:59:05 -04:00
Colin Megill 80f7bb7aa4 render histos on open gene set 2020-05-11 13:58:46 -04:00
Colin Megill 284631f9b6 prototyping 2020-05-11 13:58:46 -04:00
Colin Megill 9026e0ce41 Sci notation on continuous legend (#1450) 
* sci notation on continuous legend

* significant digits
 2020-05-07 12:59:10 -04:00
Colin Megill 7ec9bb92f7 Create new label button overflow (#1459) 
* Tighten up copy

* amp;
 2020-05-07 12:58:21 -04:00
Colin Megill 67d7b8160f was 27, 41 was too long, 33 seems ok (#1458) 2020-05-05 15:47:18 -04:00
Colin Megill 630b59d4a7 remove popover (#1456) 2020-05-05 14:34:11 -04:00
Colin Megillandbkmartinjr ea434fc46f Handle loading state when rendering categories with one label (#1393) 
* refactor & loading state

* truncate

* fix minor PR review issues

* lint

Co-authored-by: bkmartinjr <bruce@chanzuckerberg.com>
 2020-04-15 14:38:44 -04:00
Colin Megill 64bd908c25 Render categories with one label without checkbox (#1375) 
* categories with 1 item rendered without checkbox

* break out into helper functions

* prettier
 2020-04-13 23:04:23 -04:00
Colin Megill adf7010f50 Add TOS and Privacy url via config (#1300) 
* add tos and privacy url via config

* typo

* readd condition

* param
 2020-03-26 11:33:41 -04:00
Colin Megill c4731d52e2 target blank (#1254) 2020-03-20 20:07:51 -04:00
Colin MegillandMatt Weiden 234f25b782 Conditionally truncate category string (#1206) 
* maybe truncate string

* add string formatting to test

* correct import

* destructuring

* add maxlength

* test

* Respond to feedback from @bkmartinjr

Co-authored-by: Matt Weiden <538456+mweiden@users.noreply.github.com>
 2020-03-10 18:14:26 -07:00
Colin Megill 1a93068810 Prevent category collapsing on annotation edit, # of cells on add label button (#1204) 
* collapse functionality

* expand collapse
 2020-03-10 13:21:06 -04:00
Colin Megill 9bdcf44564 Separate ontologies dialogue (#1126) 
* componetization

* Ontologies as own menu option

* remove log

* remove dead suggest module
 2020-01-27 15:10:57 -05:00
Colin MegillBruce MartinSidney Bell
 		d48647a655 Ontologies (#1110) 
* add sample ontologies file

* add ontologies reducer

* Move select category to own component

* Dialog and Input factored out

* refactoring categorical, partway

* validationn

* anno

* suggest  populates input

* frontend for ontology working

* initial implementation of back-end support for ontologies

* edit is now dialog again

* autosuggest working on edit

* part way through create arbitrary label

* handle choice in function

* pass duplicate cat  prop

* editing works

* update test to match new CLI params

* fix occupancy alignment

* edit category as dialogue

* secondary button

* remove stubbed out ontologies

* add label setting upon new label creation

* Update legal characters for labels (#1119)

* Allow any term in the ontology (bypass legal name check)

* Add hyphens and parens to legal characters in names

* improve performance for large ontologies

* correctly handle case where ontologies are disabled

* fix logic error in CLI

Co-authored-by: Bruce Martin <bruce@chanzuckerberg.com>

* PR cleanup 1

* lint

* validate user generated labels

* finish hooking up connected suggest component

* protect against undefined callbacks

* Fix illegal characters error message

* break out npm run commands

* fix error detection on label edit

Co-authored-by: Bruce Martin <bruce@chanzuckerberg.com>
Co-authored-by: Sidney Bell <sidneymbell@users.noreply.github.com>
 2020-01-23 17:04:17 -05:00
Colin Megill 824ec10498 render histos on open gene set 2019-12-10 21:37:09 -08:00
Colin Megill 7ca6376665 prototyping 2019-12-09 07:47:01 -08:00
Colin Megill c2ededfc62 Anno editing label/category error states (#1048) 
* anno error states

* label validation should not treat empty string as error

* disable Submit if no label or category entered

* edit category name error states

* flex start

* pr cleanup

* label name validation fixes

* PR comment responses
 2019-11-21 19:08:29 -05:00
Colin Megill 89d748b007 state (#1032) 2019-11-13 15:13:15 -05:00
Colin Megill cadf710bf8 remove duplicate handler (#1027) 2019-11-08 11:18:29 -05:00
Colin Megill 84900bad0e Warnings on anno textfields (#1023) 
*  Warning for creating new label with an existing name

* category dup

* italics
 2019-11-07 18:57:15 -05:00
Colin Megill 4c3d783fc8 Continuous data in right sidebar (#985) 
* Create right sidebar files, move histos over

* restructure continuous legend + all padding

* right sidebar file

* proper graph positioning and resize

* new lasso values since right sidebar

* fix autosave position
 2019-11-05 20:29:21 -05:00
Colin Megill e50fd8b881 Animate list items on name change (#1008) 
* animate list items

* fix comment
 2019-11-04 14:09:16 -05:00
Colin Megill 3f0567c59f disable editing if already editing (#999) 2019-10-31 13:46:59 -04:00
Colin Megill 934f61f2a1 categoryAddingNewLabel (#995) 2019-10-24 22:02:38 -04:00
Colin Megill 1467357db5 re-label (#973) 2019-10-07 16:02:09 -04:00
Colin Megill 296352b620 remove modal for inline edit category name, and autofocus (#962) 
* remove modal for inline edit category name, and autofocus

* remove comment, rename to categorybeingedited
 2019-10-04 13:41:05 -04:00
Colin Megill e64f4f06fb enter submits modals (#945) 2019-09-25 15:18:33 -07:00
Colin Megill 197ea9214a fix italic (#935) 2019-09-18 19:36:49 -04:00
Colin Megill 81e57afe29 Anno fixes (easy) (#925) 
* change wording from value to label

* tooltip position

* Padding for text & code whitespace
 2019-09-18 19:22:51 -04:00
Colin Megill ec4da63408 Format histogram axes: 200,000 --> 200k (#913) 
* remove dead file

* tickformat
 2019-09-16 17:07:51 -04:00
Colin Megill 03baa1ac0b overflow title (#858) 2019-08-05 14:08:41 -04:00
Colin Megill d16a69e158 bump version to 0.11.0 (#850) 
* bump version to 0.11.0

* manually fix version number
 2019-07-16 14:27:41 -04:00
Colin Megill 777214cc14 upgrade lodash (#844) 2019-07-11 18:35:57 -04:00
Colin Megill 6aeefb0fe6 menubar (#804) 
* menubar 1

* zoom switching

* centering, pixel perfect canvas

* remove dead args and code

* clipping

* remove log

* if

* connect props

* lint

* undo

* logo left, componetize

* graph back to full height

* shadow to top

* do not prematurely call event handlers during render

* change test to deal with async histogram creation

* left section padding

* lint

* adjust graph to account for top bar,

* lasso tests

* refine histogram tests

* remove testing (onlys)
 2019-06-13 15:15:43 -07:00
Colin Megill 862d8feb5e x (#792) 2019-05-29 12:23:30 -04:00
Colin Megill a657eb3152 Logo (#782) 
* logo, black

* fixes

* remove template, move header
 2019-05-23 11:47:24 -04:00
Colin Megill 86bf64e793 avoid overflow on clip dialogue (#740) 2019-05-01 15:41:54 -04:00
Colin Megill b878b0f93c Gene typeahead stale state (#714) 
* reimplementing suggest

* resolve stale state
 2019-04-17 14:03:10 -04:00
Colin Megill 016a4a422a Procedurally resize brush (#650) 
* add on brush end event

* brush snap move

* resize brush
 2019-03-20 14:46:20 -07:00
Colin Megill 8795f0f32c Add test ids and classes (#633) 
* data test ids and classes

* suggest
 2019-03-07 13:01:41 -08:00
Colin Megill a0f54b4871 Add menu (#631) 
* add menu

* Added library versions to config

and tests

* add template version number
 2019-03-06 11:56:46 -05:00
Colin Megill dbb3a309a9 Lasso (#586) 
* lasso working

* break out invert into own function

* action

* add spatial dimension to crossfilter, in support of polygon lasso

* improve comments on new dimension API

* lasso vs zoom
 2019-02-08 11:48:51 -08:00
Colin Megill 08ea7d5137 Better input validation (#580) 2019-02-05 10:44:59 -05:00
Colin Megill 2df7161cd8 Bulk add genes (#567) 
* bulk add

* cleanup
 2019-01-29 16:26:09 -05:00