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.

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

Added cards inside PlotModule #253

Merged
merged 27 commits into from
May 8, 2023
Merged

Added cards inside PlotModule #253

merged 27 commits into from
May 8, 2023

Conversation

ESCRI11
Copy link
Contributor

@ESCRI11 ESCRI11 commented Mar 21, 2023

Description

Provide the option of using cards inside a PlotModule (Figure 1).

Features

If we place two plots inside the same PlotModule I expect them to be simiar in nature, therefore, the information button will display the same no matter which plot is active. The download button will download the active plot and the options button will display the options for the selected plot.

When displaying the modal output, cards are still inside (Figure 2). This could be changed so that the modal shows the selected card only.

Usage

On the PlotModuleUI we have to use the arguments cards and card_names:

  • card: Bool value. If TRUE, cards will be used.
  • card_names: Name of the cards (on Figure 1 would be c("card1", "card2")).

UI example code Figure1:

PlotModuleUI(
    ns("pltmod"),
    plotlib = "plotly",
    info.text = info_text,
    download.fmt = c("png", "pdf", "csv"),
    title = "Dataset explorer",
    cards = TRUE,
    card_names = c("card1", "card2")
  )

On the PlotModuleServer we have to create as many servers as cards. In this example, we have two plots, so two servers:

  • ID is shared between the UI declaration and all the servers
  • We just specify which servers correspond to which card numerically
PlotModuleServer(
      "pltmod",
      plotlib = "plotly",
      func = plot.RENDER,
      func2 = modal_plot.RENDER,
      card = 1
  )
PlotModuleServer(
      "pltmod",
      plotlib = "plotly",
      func = plot.RENDER2,
      func2 = modal_plot.RENDER2,
      card = 2
  )

Additional information

I am working on a developers guide for the PlotModule explaining all the different options it has and how to use them. The provided information in this PR will be included on the wiki.


Figure 1

image

Figure 2

image

commit 8a5116b
Author: ivokwee <[email protected]>
Date:   Tue Mar 21 09:44:26 2023 +0100

    fix code/layout

commit 2fb90f8
Author: ivokwee <[email protected]>
Date:   Tue Mar 21 02:18:31 2023 +0100

    correct modal plot content widths (in progress)

commit 0927cac
Merge: 19f1f38 efea20d
Author: Ivo Kwee <[email protected]>
Date:   Mon Mar 20 23:55:22 2023 +0100

    Merge pull request #251 from bigomics/revert-250-dev-grid-cards

    Revert "Dev-cards-bs5"

commit efea20d
Author: Ivo Kwee <[email protected]>
Date:   Mon Mar 20 23:54:16 2023 +0100

    Revert "Dev-cards-bs5"

commit 19f1f38
Merge: 9a384be 19e445d
Author: Ivo Kwee <[email protected]>
Date:   Mon Mar 20 22:53:20 2023 +0100

    Merge pull request #250 from bigomics/dev-grid-cards

    Dev-cards-bs5. Merging but let's remove for the moment the wireframe  (card outline) and get the original UI look as close as possible.

commit 9a384be
Author: ivokwee <[email protected]>
Date:   Mon Mar 20 20:17:11 2023 +0100

    add pgx in all req() to prevent runtime errors

commit 826ffd7
Merge: f838b45 8fb6509
Author: ivokwee <[email protected]>
Date:   Mon Mar 20 20:15:25 2023 +0100

    Merge branch 'master' of https://github.com/bigomics/omicsplayground

commit f838b45
Author: ivokwee <[email protected]>
Date:   Mon Mar 20 20:15:20 2023 +0100

    correct drug-tab tabrequire

commit 8fb6509
Author: ncullen93 <[email protected]>
Date:   Mon Mar 20 17:04:56 2023 +0000

    fix: account for cluster rank in group labels

commit 5c9529b
Author: ivokwee <[email protected]>
Date:   Mon Mar 20 16:02:50 2023 +0100

    correct function.name

commit ff7ab08
Author: ivokwee <[email protected]>
Date:   Mon Mar 20 16:01:06 2023 +0100

    version rc3

commit e8b86f4
Author: ivokwee <[email protected]>
Date:   Mon Mar 20 16:00:17 2023 +0100

    remove dbg

commit a2fbe0b
Author: ivokwee <[email protected]>
Date:   Mon Mar 20 15:59:26 2023 +0100

    correct shiny detection

commit 19e445d
Author: Mauro Masiero <[email protected]>
Date:   Mon Mar 20 15:56:12 2023 +0100

    source `cards.scss`

commit 16872c5
Author: Mauro Masiero <[email protected]>
Date:   Mon Mar 20 15:56:00 2023 +0100

    feat: remove info button from plot

commit 4bd9f41
Author: Mauro Masiero <[email protected]>
Date:   Mon Mar 20 15:55:27 2023 +0100

    feat: reduce card padding

commit e00fa9e
Author: Mauro Masiero <[email protected]>
Date:   Mon Mar 20 15:41:54 2023 +0100

    remove class plotmodule

commit 98a759e
Author: Mauro Masiero <[email protected]>
Date:   Mon Mar 20 15:37:46 2023 +0100

    add footer background color

commit 4504d69
Author: Mauro Masiero <[email protected]>
Date:   Mon Mar 20 15:37:32 2023 +0100

    remove browser

commit 2e2ac9c
Merge: 50c2997 78e668a
Author: Mauro Masiero <[email protected]>
Date:   Mon Mar 20 15:11:20 2023 +0100

    Merge branch 'dev-grid-cards' of https://github.com/bigomics/omicsplayground into dev-grid-cards

commit 78e668a
Author: Xavier Escribà Montagut <[email protected]>
Date:   Mon Mar 20 15:08:45 2023 +0100

    fix: placed cards inside div + removed full screen

    somehow, this allows the updateInputs to work, not sure why otherwise they are not working

commit 50c2997
Author: Mauro Masiero <[email protected]>
Date:   Mon Mar 20 15:03:27 2023 +0100

    feat: add footer to cards

commit 75fae68
Author: Mauro Masiero <[email protected]>
Date:   Mon Mar 20 14:08:56 2023 +0100

    feat: cards implemented in plot module

commit e11fd30
Merge: 4b468f7 6124138
Author: ivokwee <[email protected]>
Date:   Mon Mar 20 10:36:56 2023 +0100

    Merge branch 'master' of https://github.com/bigomics/omicsplayground

commit 4b468f7
Author: ivokwee <[email protected]>
Date:   Mon Mar 20 10:36:52 2023 +0100

    restore default OPTIONS

commit 6124138
Author: Mauro Masiero <[email protected]>
Date:   Mon Mar 20 07:55:13 2023 +0100

    improve distance between welcome page buttons

commit 8b60ed2
Author: ivokwee <[email protected]>
Date:   Mon Mar 20 01:34:51 2023 +0100

    update

commit cd76e0f
Author: ivokwee <[email protected]>
Date:   Mon Mar 20 01:30:20 2023 +0100

    rename to declared->defined

commit 0aa240a
Author: ivokwee <[email protected]>
Date:   Mon Mar 20 01:10:44 2023 +0100

    add code analyzer

commit fc8a0dd
Author: ivokwee <[email protected]>
Date:   Sun Mar 19 21:33:22 2023 +0100

    resolve issue #238 with caption overlap: decrease scrollY in table

commit fe29fa4
Author: ivokwee <[email protected]>
Date:   Sun Mar 19 20:15:26 2023 +0100

    revert to prev welcom message

commit 6696212
Merge: 0bbaeb5 a21f003
Author: Ivo Kwee <[email protected]>
Date:   Sun Mar 19 20:11:57 2023 +0100

    Merge pull request #247 from bigomics/dev-home

    Dev home

commit a21f003
Merge: aa093c4 0bbaeb5
Author: Ivo Kwee <[email protected]>
Date:   Sun Mar 19 20:11:38 2023 +0100

    Merge branch 'master' into dev-home

commit 0bbaeb5
Author: ivokwee <[email protected]>
Date:   Sun Mar 19 20:04:43 2023 +0100

    cleanup & cosmetics

commit aa093c4
Author: Mauro Masiero <[email protected]>
Date:   Sun Mar 19 18:32:33 2023 +0100

    feat: allow user to load example-data multiple times

commit 9802741
Author: Mauro Masiero <[email protected]>
Date:   Sun Mar 19 18:12:47 2023 +0100

    feat: center align modal dialog pop up; remove css that gets overwritten by bs5

commit a4063a6
Author: ivokwee <[email protected]>
Date:   Sun Mar 19 06:35:24 2023 +0100

    edit CSS layout tables & sft

commit 9cda1d4
Author: ivokwee <[email protected]>
Date:   Sun Mar 19 03:06:45 2023 +0100

    small refactor

commit d4e77d0
Author: ivokwee <[email protected]>
Date:   Sun Mar 19 02:16:51 2023 +0100

    add copyright header

commit cade4f9
Author: ivokwee <[email protected]>
Date:   Sun Mar 19 02:01:20 2023 +0100

    edit credits

commit b2172b8
Author: ivokwee <[email protected]>
Date:   Sun Mar 19 01:57:18 2023 +0100

    edit credits

commit 5ec1a1e
Author: ivokwee <[email protected]>
Date:   Sun Mar 19 01:54:22 2023 +0100

    edit credits

commit 8ea8122
Author: ivokwee <[email protected]>
Date:   Sun Mar 19 01:35:47 2023 +0100

    update creditse && git push

commit c09d4b3
Author: ivokwee <[email protected]>
Date:   Sun Mar 19 01:32:12 2023 +0100

    add credit popup

commit 1473c70
Author: ivokwee <[email protected]>
Date:   Sat Mar 18 23:59:41 2023 +0100

    add file

commit 94a09e2
Author: ivokwee <[email protected]>
Date:   Sat Mar 18 23:59:02 2023 +0100

    lots of little changes

commit b32defd
Author: Mauro Masiero <[email protected]>
Date:   Sat Mar 18 20:00:58 2023 +0100

    improve existing user text

commit 9961936
Author: Mauro Masiero <[email protected]>
Date:   Sat Mar 18 18:54:10 2023 +0100

    improving load example data description for user

commit 180ca73
Author: Mauro Masiero <[email protected]>
Date:   Sat Mar 18 18:47:18 2023 +0100

    add cursor pointer on logo mouse hover

commit fefeb8d
Author: Mauro Masiero <[email protected]>
Date:   Sat Mar 18 18:25:23 2023 +0100

    welcome board now triggered

commit 9ced0a8
Author: Mauro Masiero <[email protected]>
Date:   Sat Mar 18 18:13:25 2023 +0100

    click on logo trigger successful

commit 03f2256
Author: Mauro Masiero <[email protected]>
Date:   Sat Mar 18 17:51:18 2023 +0100

    add id to logo bigomics

commit 892d284
Author: Mauro Masiero <[email protected]>
Date:   Sat Mar 18 17:50:03 2023 +0100

    removing code that is overwriting correct styles

commit 7080f00
Author: Mauro Masiero <[email protected]>
Date:   Sat Mar 18 17:37:42 2023 +0100

    improving modal dialog box size in all screens screens

commit 90848bb
Author: ivokwee <[email protected]>
Date:   Sat Mar 18 01:46:12 2023 +0100

    correct zoom plot layout

commit be35a75
Author: ivokwee <[email protected]>
Date:   Fri Mar 17 23:51:09 2023 +0100

    labels bit up

commit e38a6ff
Merge: 835698c 6bde44a
Author: ivokwee <[email protected]>
Date:   Fri Mar 17 23:11:38 2023 +0100

    Merge branch 'master' of https://github.com/bigomics/omicsplayground

commit 835698c
Author: ivokwee <[email protected]>
Date:   Fri Mar 17 23:11:34 2023 +0100

    add ensable/disable upload

commit 6bde44a
Author: Xavier Escribà Montagut <[email protected]>
Date:   Fri Mar 17 17:18:00 2023 +0100

    feat: plotly defaults added globally

commit fe00711
Author: Xavier Escribà Montagut <[email protected]>
Date:   Fri Mar 17 17:14:51 2023 +0100

    feat: plot editor embedded

commit d1d1110
Author: ivokwee <[email protected]>
Date:   Fri Mar 17 14:57:47 2023 +0100

    remove xtitle

commit 574024f
Author: ivokwee <[email protected]>
Date:   Fri Mar 17 14:29:59 2023 +0100

    correct layout

commit 2afdcfb
Author: ivokwee <[email protected]>
Date:   Fri Mar 17 13:53:11 2023 +0100

    fix csv output format digits

commit 33909ff
Author: ivokwee <[email protected]>
Date:   Fri Mar 17 13:28:14 2023 +0100

    move install RSpectra to base image

commit f2f43aa
Author: ivokwee <[email protected]>
Date:   Fri Mar 17 13:27:24 2023 +0100

    fix layout KEGG tab

commit ce7b533
Author: ivokwee <[email protected]>
Date:   Fri Mar 17 12:58:09 2023 +0100

    align tabs

commit 92d8aac
Author: ivokwee <[email protected]>
Date:   Fri Mar 17 01:26:03 2023 +0100

    update scss

commit 6cba0b1
Author: ivokwee <[email protected]>
Date:   Fri Mar 17 01:25:20 2023 +0100

    update scss

commit 5800dc5
Author: ivokwee <[email protected]>
Date:   Fri Mar 17 00:21:33 2023 +0100

    version rc1

commit fed2027
Author: ivokwee <[email protected]>
Date:   Fri Mar 17 00:04:04 2023 +0100

    show version at start

commit 4f02fa8
Author: ivokwee <[email protected]>
Date:   Thu Mar 16 23:53:13 2023 +0100

    fix layout and clean up code

commit 08ac085
Author: ncullen93 <[email protected]>
Date:   Thu Mar 16 16:53:02 2023 +0100

    add icons to table menu and left-align text

commit e4e1419
Merge: ef7da8f 619d0ac
Author: ncullen93 <[email protected]>
Date:   Thu Mar 16 11:41:16 2023 -0400

    Merge pull request #241 from bigomics/share-datasets

    Share datasets

commit 619d0ac
Merge: 655efc7 ef7da8f
Author: ncullen93 <[email protected]>
Date:   Thu Mar 16 11:41:07 2023 -0400

    Merge branch 'master' into share-datasets

commit ef7da8f
Author: ivokwee <[email protected]>
Date:   Thu Mar 16 16:39:01 2023 +0100

    enable hide/show of main menu items (issue #224)

commit c8d5933
Author: ivokwee <[email protected]>
Date:   Thu Mar 16 16:36:00 2023 +0100

    add refs

commit 661fe2a
Author: ivokwee <[email protected]>
Date:   Thu Mar 16 16:35:16 2023 +0100

    add beta labels in menu

commit 13cafbf
Merge: 2a7e8ee bd2fa9e
Author: Ivo Kwee <[email protected]>
Date:   Thu Mar 16 16:28:41 2023 +0100

    Merge pull request #240 from bigomics/loading-tsne

    make separate shared tsne

commit 655efc7
Author: ncullen93 <[email protected]>
Date:   Thu Mar 16 15:36:40 2023 +0100

    download zip now works

commit dadabfc
Author: ncullen93 <[email protected]>
Date:   Thu Mar 16 15:25:14 2023 +0100

    all buttons besides zip work

commit 2a7e8ee
Author: ivokwee <[email protected]>
Date:   Thu Mar 16 13:38:04 2023 +0100

    make caption 13px

commit bd2fa9e
Author: ivokwee <[email protected]>
Date:   Thu Mar 16 13:33:06 2023 +0100

    make separate shared tsne

commit e832b77
Author: ivokwee <[email protected]>
Date:   Thu Mar 16 12:11:51 2023 +0100

    rename tab names

commit e7e24ed
Merge: 489774b 44e1c57
Author: ivokwee <[email protected]>
Date:   Thu Mar 16 12:10:55 2023 +0100

    Merge branch 'master' of https://github.com/bigomics/omicsplayground

commit 489774b
Author: ivokwee <[email protected]>
Date:   Thu Mar 16 12:10:42 2023 +0100

    add loading dbg output

commit 8475a56
Author: ncullen93 <[email protected]>
Date:   Thu Mar 16 11:36:36 2023 +0100

    add action menus to table

commit 44e1c57
Merge: 23c280c 03128f6
Author: Mauro Masiero <[email protected]>
Date:   Thu Mar 16 11:28:58 2023 +0100

    Merge branch 'master' of https://github.com/bigomics/omicsplayground

commit 23c280c
Author: Mauro Masiero <[email protected]>
Date:   Thu Mar 16 11:28:55 2023 +0100

    plot_table_geneset_map now plotly

commit 00c282d
Author: Mauro Masiero <[email protected]>
Date:   Thu Mar 16 11:28:39 2023 +0100

    plot_table_gene_map now plotly

commit 03128f6
Merge: 642780f ef1f7b1
Author: ivokwee <[email protected]>
Date:   Thu Mar 16 10:56:40 2023 +0100

    Merge branch 'master' of https://github.com/bigomics/omicsplayground

commit 642780f
Author: ivokwee <[email protected]>
Date:   Thu Mar 16 10:56:36 2023 +0100

    add grid breakpoint xxxl=2400px & using single bootstrap row

commit ef1f7b1
Author: Mauro Masiero <[email protected]>
Date:   Thu Mar 16 10:21:05 2023 +0100

    solve issue #237

commit 73f4d73
Author: Mauro Masiero <[email protected]>
Date:   Wed Mar 15 22:37:09 2023 +0100

    remove browser

commit aaf667b
Author: Mauro Masiero <[email protected]>
Date:   Wed Mar 15 17:55:18 2023 +0100

    move FILES to reactive function

commit d305589
Author: Mauro Masiero <[email protected]>
Date:   Wed Mar 15 17:09:25 2023 +0100

    fix selector on kegg_table_server

commit d49e92a
Author: ivokwee <[email protected]>
Date:   Wed Mar 15 16:35:29 2023 +0100

    change layout

commit 83f23ab
Author: ivokwee <[email protected]>
Date:   Wed Mar 15 15:33:49 2023 +0100

    add Specra r package

commit 2e2d092
Author: ncullen93 <[email protected]>
Date:   Wed Mar 15 15:28:01 2023 +0100

    confirmation dialog added to share dataset

commit 284624a
Author: ncullen93 <[email protected]>
Date:   Wed Mar 15 14:21:23 2023 +0100

    user datasets can now be shared; missing modal confirmation before sharing though

commit b0d465e
Author: ncullen93 <[email protected]>
Date:   Wed Mar 15 11:52:03 2023 +0100

    welcomeboard: close right sidebar when going to load data page

commit e7c8f28
Author: ncullen93 <[email protected]>
Date:   Wed Mar 15 11:16:12 2023 +0100

    board.loading: buttons in shared dataset table also now disabled when no dataset selected

commit a3b2bef
Author: ncullen93 <[email protected]>
Date:   Wed Mar 15 10:46:14 2023 +0100

    board.loading: buttons are disabled when no dataset is selected

commit 24d399e
Author: ncullen93 <[email protected]>
Date:   Wed Mar 15 10:11:00 2023 +0100

    remove hover feature on board.loading buttons

commit 9483cea
Author: ncullen93 <[email protected]>
Date:   Wed Mar 15 09:58:57 2023 +0100

    make table color of selected row a bit darker

commit cdd1c34
Author: ncullen93 <[email protected]>
Date:   Wed Mar 15 09:45:12 2023 +0100

    board.loading: tsne plot now aligns with datasets table

commit 59f9062
Author: Xavier Escribà Montagut <[email protected]>
Date:   Tue Mar 14 23:08:27 2023 +0100

    feat: embed plotly editor on iframe modal

commit 8ddb9b3
Author: mauromiguelm <[email protected]>
Date:   Tue Mar 14 17:32:08 2023 +0100

    fix: tsneplot width bug

commit 881ee5c
Merge: fd44cd3 1e19913
Author: Mauro Masiero <[email protected]>
Date:   Tue Mar 14 17:23:14 2023 +0100

    Merge branch 'master' of https://github.com/bigomics/omicsplayground

commit fd44cd3
Author: Mauro Masiero <[email protected]>
Date:   Tue Mar 14 17:23:11 2023 +0100

    update requirements

commit 1e19913
Author: ncullen93 <[email protected]>
Date:   Tue Mar 14 15:48:37 2023 +0100

    fix: pgxtable displays correctly after loading example dataset

commit 698ee35
Author: ncullen93 <[email protected]>
Date:   Tue Mar 14 13:44:52 2023 +0100

    remove all remaining inputData refs

commit 080820a
Author: ncullen93 <[email protected]>
Date:   Tue Mar 14 13:43:25 2023 +0100

    boards compare + tcga + wgcna: ngs + inputData -> pgx

commit 07db192
Author: ncullen93 <[email protected]>
Date:   Tue Mar 14 13:37:45 2023 +0100

    board.singlecell: ngs + inputData -> pgx

commit e7848da
Author: ncullen93 <[email protected]>
Date:   Tue Mar 14 13:33:49 2023 +0100

    board.connectivity: ngs + inputData -> pgx

commit 15ded9c
Author: ncullen93 <[email protected]>
Date:   Tue Mar 14 13:30:58 2023 +0100

    board.biomarker: ngs + inputData -> pgx

commit 4cec562
Author: ncullen93 <[email protected]>
Date:   Tue Mar 14 13:29:24 2023 +0100

    board.correlation: ngs + inputData -> pgx

commit ae8a32b
Author: ncullen93 <[email protected]>
Date:   Tue Mar 14 13:26:59 2023 +0100

    board.signature: ngs + inputData -> pgx

commit fb7cd2b
Author: ncullen93 <[email protected]>
Date:   Tue Mar 14 13:24:31 2023 +0100

    board.intersection: ngs + inputData -> pgx

commit ff18b5e
Author: ncullen93 <[email protected]>
Date:   Tue Mar 14 11:50:03 2023 +0100

    board.drugconnectivity: inputData + ngs -> pgx

commit 1b0850c
Author: ncullen93 <[email protected]>
Date:   Tue Mar 14 11:45:51 2023 +0100

    board.functional: inputData + ngs -> pgx

commit 10906ce
Merge: 7dd9127 051035b
Author: ncullen93 <[email protected]>
Date:   Tue Mar 14 06:41:36 2023 -0400

    Merge pull request #227 from bigomics/FeatureMapBoard-to-pgx

    remove inputData and ngs refs in favor of pgx

commit 7dd9127
Merge: 4801d3b f582e31
Author: ncullen93 <[email protected]>
Date:   Tue Mar 14 06:41:25 2023 -0400

    Merge pull request #228 from bigomics/EnrichmentBoard-to-pgx

    replace ngs and inputData with pgx

commit f582e31
Author: ncullen93 <[email protected]>
Date:   Tue Mar 14 11:40:46 2023 +0100

    replace ngs and inputData with pgx

commit 051035b
Author: ncullen93 <[email protected]>
Date:   Tue Mar 14 11:33:34 2023 +0100

    remove inputData and ngs refs in favor of pgx

commit 4801d3b
Merge: b86405d 2831095
Author: ncullen93 <[email protected]>
Date:   Tue Mar 14 11:24:27 2023 +0100

    Merge branch 'master' of https://github.com/bigomics/omicsplayground

commit b86405d
Author: ncullen93 <[email protected]>
Date:   Tue Mar 14 11:24:19 2023 +0100

    better validate message for gene table

commit 2831095
Merge: b1e1ec1 724e40c
Author: ncullen93 <[email protected]>
Date:   Tue Mar 14 06:17:26 2023 -0400

    Merge pull request #226 from bigomics/fix-diffexpr-blinking

    fix: diffexpr plots blink and initialize to all genes selected

commit 724e40c
Author: ncullen93 <[email protected]>
Date:   Tue Mar 14 11:16:21 2023 +0100

    fix: diffexpr plots blink and initialize to all genes selected

commit b1e1ec1
Author: ncullen93 <[email protected]>
Date:   Tue Mar 14 10:51:46 2023 +0100

    fix: pgxtable blank after uploading dataset

commit 057ac22
Merge: b40633a fdea6cf
Author: ncullen93 <[email protected]>
Date:   Tue Mar 14 04:59:36 2023 -0400

    Merge pull request #221 from bigomics/js-to-shiny

    create Shiny wrappers around bigdash JS triggers... end of JS PITA..

commit fdea6cf
Merge: b9abcc6 b40633a
Author: ncullen93 <[email protected]>
Date:   Tue Mar 14 04:59:29 2023 -0400

    Merge branch 'master' into js-to-shiny

commit b40633a
Merge: 6fd984a 0e0e71b
Author: ncullen93 <[email protected]>
Date:   Tue Mar 14 04:57:57 2023 -0400

    Merge pull request #223 from bigomics/inputData-pgx-convert

    Input data pgx convert

commit 0e0e71b
Author: ncullen93 <[email protected]>
Date:   Tue Mar 14 09:56:53 2023 +0100

    expression board to pgx

commit 176cb41
Author: ncullen93 <[email protected]>
Date:   Tue Mar 14 09:49:38 2023 +0100

    board.expression converted to pgx

commit 6fd984a
Author: ivokwee <[email protected]>
Date:   Tue Mar 14 04:11:51 2023 +0100

    reverting temporary

commit 7656054
Author: ivokwee <[email protected]>
Date:   Tue Mar 14 04:07:24 2023 +0100

    stupid mistake

commit b9abcc6
Author: ivokwee <[email protected]>
Date:   Tue Mar 14 03:41:59 2023 +0100

    create Shiny wrappers around bigdash JS triggers... end of JS PITA..

commit 6a7acec
Author: ivokwee <[email protected]>
Date:   Tue Mar 14 00:28:42 2023 +0100

    move paddings settings to bigdash css

commit 3191420
Merge: 4d63fcf c91ae0e
Author: ivokwee <[email protected]>
Date:   Tue Mar 14 00:27:25 2023 +0100

    Merge branch 'master' of https://github.com/bigomics/omicsplayground

commit 4d63fcf
Author: ivokwee <[email protected]>
Date:   Tue Mar 14 00:27:20 2023 +0100

    add bigdash.selectTab

commit c91ae0e
Author: mauromiguelm <[email protected]>
Date:   Mon Mar 13 23:22:55 2023 +0100

    passed reload pgx reactives to r_global

    trigger observers in load module from upload module, may have cross reactivity

commit 7a5c316
Merge: c111c3d 0d26550
Author: ivokwee <[email protected]>
Date:   Mon Mar 13 20:09:12 2023 +0100

    Merge branch 'master' of https://github.com/bigomics/omicsplayground

commit c111c3d
Author: ivokwee <[email protected]>
Date:   Mon Mar 13 20:09:07 2023 +0100

    remove message

commit 0d26550
Author: mauromiguelm <[email protected]>
Date:   Mon Mar 13 18:58:53 2023 +0100

    magic line that makes all work

commit 63aef5d
Author: mauromiguelm <[email protected]>
Date:   Mon Mar 13 18:52:58 2023 +0100

    show tabs when data is uploaded

commit 0aab78c
Author: mauromiguelm <[email protected]>
Date:   Mon Mar 13 18:52:30 2023 +0100

    upload works again (!)

commit 7ec31b1
Merge: 7319607 573ace7
Author: ivokwee <[email protected]>
Date:   Mon Mar 13 10:04:01 2023 +0100

    Merge branch 'master' of https://github.com/bigomics/omicsplayground

commit 7319607
Author: ivokwee <[email protected]>
Date:   Mon Mar 13 10:03:56 2023 +0100

    correct mouse detection

commit 573ace7
Author: ncullen93 <[email protected]>
Date:   Mon Mar 13 09:51:54 2023 +0100

    fix issue: clicking load example dataset ran but the page didnt change

commit 54d9377
Author: ivokwee <[email protected]>
Date:   Mon Mar 13 02:58:03 2023 +0100

    add require(magrittr)

commit e6f6e86
Author: ivokwee <[email protected]>
Date:   Mon Mar 13 02:14:40 2023 +0100

    move to boardHeader.R to base

commit 33a60aa
Author: ivokwee <[email protected]>
Date:   Mon Mar 13 01:27:54 2023 +0100

    put KEGGgraph/pathview in base

commit 55cce82
Author: ivokwee <[email protected]>
Date:   Mon Mar 13 00:04:18 2023 +0100

    renaming files

commit 2d2a93d
Author: ivokwee <[email protected]>
Date:   Sun Mar 12 23:52:37 2023 +0100

    move to base/R

commit 8a766bc
Author: ivokwee <[email protected]>
Date:   Sun Mar 12 22:46:21 2023 +0100

    correct name typo DropdownMenu

commit 8825b6b
Merge: e2ddbb0 beedbae
Author: ivokwee <[email protected]>
Date:   Sun Mar 12 20:09:08 2023 +0100

    Merge branch 'master' of https://github.com/bigomics/omicsplayground

commit e2ddbb0
Author: ivokwee <[email protected]>
Date:   Sun Mar 12 20:09:03 2023 +0100

    add KEGGgraph in requirements

commit beedbae
Author: Xavier Escribà Montagut <[email protected]>
Date:   Sun Mar 12 20:04:58 2023 +0100

    fix: missing package

    Package needed for `plotly_json` (plot editor)

commit 8dacc1d
Author: ivokwee <[email protected]>
Date:   Sun Mar 12 18:48:07 2023 +0100

    restore dynamic menu

commit a2f94c6
Author: ivokwee <[email protected]>
Date:   Sun Mar 12 18:47:01 2023 +0100

    correct mem.proc for non-linux

commit 9f6fdb0
Author: mauromiguelm <[email protected]>
Date:   Sun Mar 12 13:53:51 2023 +0100

    fix: reduce pop up size and center elements #198

commit ebfbce6
Author: ivokwee <[email protected]>
Date:   Sun Mar 12 06:49:24 2023 +0100

    restore line height in table

commit 94c890b
Author: ivokwee <[email protected]>
Date:   Sun Mar 12 05:08:26 2023 +0100

    disable renv inside docker

commit 24f3cd8
Merge: b825f7f 7a767a3
Author: ivokwee <[email protected]>
Date:   Sun Mar 12 04:54:52 2023 +0100

    Merge branch 'master' of https://github.com/bigomics/omicsplayground

commit b825f7f
Author: ivokwee <[email protected]>
Date:   Sun Mar 12 04:54:47 2023 +0100

    rm/add extdata packages

commit 7a767a3
Author: ncullen93 <[email protected]>
Date:   Sat Mar 11 12:16:24 2023 +0100

    fixed dataview plot blinking

commit 683f204
Author: ivokwee <[email protected]>
Date:   Sat Mar 11 06:55:02 2023 +0100

    rework menu

commit a46451e
Author: ivokwee <[email protected]>
Date:   Sat Mar 11 02:45:55 2023 +0100

    re-added example data

commit 75bfede
Merge: a3a275c dbfce43
Author: Ivo Kwee <[email protected]>
Date:   Sat Mar 11 02:40:04 2023 +0100

    Merge pull request #205 from bigomics/public-datasets-loading

    Public datasets loading

commit dbfce43
Merge: b865b4b a3a275c
Author: Ivo Kwee <[email protected]>
Date:   Sat Mar 11 02:38:14 2023 +0100

    Merge branch 'master' into public-datasets-loading

commit b865b4b
Author: ivokwee <[email protected]>
Date:   Sat Mar 11 02:34:56 2023 +0100

    renamed public to shared which is more general name for now

commit 5f6aa2b
Author: ivokwee <[email protected]>
Date:   Sat Mar 11 02:03:02 2023 +0100

    pgx_public_dir does not need to be reactive as it should not change like pgx_dir does for different users

commit 1723f0f
Author: ivokwee <[email protected]>
Date:   Sat Mar 11 01:47:41 2023 +0100

    Please refrain from pushing entire reactive lists as arguments; be specific

commit c3ea145
Author: ivokwee <[email protected]>
Date:   Sat Mar 11 01:37:33 2023 +0100

    data_public folder should not be in userdir but always below OPG root

commit a3a275c
Merge: ac50180 db75e85
Author: ivokwee <[email protected]>
Date:   Fri Mar 10 23:29:12 2023 +0100

    Merge branch 'master' of https://github.com/bigomics/omicsplayground

commit ac50180
Author: ivokwee <[email protected]>
Date:   Fri Mar 10 23:29:08 2023 +0100

    add redirection to run.log

commit db75e85
Merge: dfbbb5e cfa6c65
Author: Mauro Masiero <[email protected]>
Date:   Thu Mar 9 21:12:13 2023 +0100

    Merge pull request #204 from bigomics/dev-settings-container

    Dev settings container

commit cfa6c65
Author: mauromiguelm <[email protected]>
Date:   Thu Mar 9 19:23:55 2023 +0100

    add new styles.min.css

commit d36b1f3
Author: mauromiguelm <[email protected]>
Date:   Thu Mar 9 19:23:41 2023 +0100

    add trigger to update state of settings bar

commit dfbbb5e
Author: ivokwee <[email protected]>
Date:   Thu Mar 9 19:05:34 2023 +0100

    correct wordcloud

commit cd19193
Author: ivokwee <[email protected]>
Date:   Thu Mar 9 19:01:43 2023 +0100

    change default

commit 0ad44ed
Merge: f85609a 29470fb
Author: ivokwee <[email protected]>
Date:   Thu Mar 9 18:57:07 2023 +0100

    Merge branch 'master' of https://github.com/bigomics/omicsplayground

commit f85609a
Author: ivokwee <[email protected]>
Date:   Thu Mar 9 18:56:56 2023 +0100

    enable/disable modules and menu

commit 54275c5
Author: ncullen93 <[email protected]>
Date:   Thu Mar 9 18:31:50 2023 +0100

    add second public dataset

commit 6919519
Author: ncullen93 <[email protected]>
Date:   Thu Mar 9 17:18:17 2023 +0100

    import public dataset button works now

commit e0a7b07
Author: ncullen93 <[email protected]>
Date:   Thu Mar 9 13:57:55 2023 +0100

    data public table works

commit fee41e3
Author: ncullen93 <[email protected]>
Date:   Thu Mar 9 10:57:48 2023 +0100

    source changes

commit c852450
Merge: 3060ae1 29470fb
Author: ncullen93 <[email protected]>
Date:   Thu Mar 9 04:33:24 2023 -0500

    Merge branch 'master' into dev-settings-container

commit 734fbef
Author: ncullen93 <[email protected]>
Date:   Wed Mar 8 22:38:24 2023 +0100

    add some example public datasets; create new file for eventual public datasets table module

commit 3060ae1
Author: mauromiguelm <[email protected]>
Date:   Wed Mar 8 17:10:14 2023 +0100

    remove default open settings sidebar at loading dataset page

commit 29470fb
Author: Xavier Escribà Montagut <[email protected]>
Date:   Wed Mar 8 17:08:46 2023 +0100

    fix: little fella disappears properly

commit 9890fd3
Author: mauromiguelm <[email protected]>
Date:   Wed Mar 8 16:18:36 2023 +0100

    remove pointer-event since its preventing mouse listener propagation

commit fe4429b
Author: ncullen93 <[email protected]>
Date:   Wed Mar 8 14:38:16 2023 +0100

    add table

commit 47524b8
Merge: f6a43bf 50d725a
Author: ncullen93 <[email protected]>
Date:   Wed Mar 8 07:43:38 2023 -0500

    Merge pull request #203 from bigomics/edit-data-description

    Edit data description

commit 50d725a
Author: ncullen93 <[email protected]>
Date:   Wed Mar 8 10:52:19 2023 +0100

    make only description column editable

commit 1e335ac
Author: ncullen93 <[email protected]>
Date:   Wed Mar 8 09:39:22 2023 +0100

    actual pgx object is edited

commit f6a43bf
Author: ivokwee <[email protected]>
Date:   Wed Mar 8 01:14:32 2023 +0100

    correct reactive pgx.dir path

commit 81eab0c
Author: ivokwee <[email protected]>
Date:   Wed Mar 8 01:13:35 2023 +0100

    shorten caption in zoom

commit 714f465
Merge: 4c30450 0c47731
Author: ivokwee <[email protected]>
Date:   Wed Mar 8 00:48:36 2023 +0100

    Merge branch 'master' of https://github.com/bigomics/omicsplayground

commit 4c30450
Author: ivokwee <[email protected]>
Date:   Wed Mar 8 00:48:31 2023 +0100

    add mem used in dbg

commit 70ae8d6
Author: ncullen93 <[email protected]>
Date:   Tue Mar 7 16:06:34 2023 +0100

    small table changes

commit 1cbb5d4
Author: ncullen93 <[email protected]>
Date:   Tue Mar 7 10:18:42 2023 +0100

    add note about needing to rewrite actual pgx file

commit af945b5
Author: ncullen93 <[email protected]>
Date:   Tue Mar 7 09:55:21 2023 +0100

    dataset meta info changes get saved to datasets-info.csv

commit 206b8a0
Author: ncullen93 <[email protected]>
Date:   Mon Mar 6 15:22:12 2023 +0100

    edit datatable on loading page

commit 943fb16
Author: mauromiguelm <[email protected]>
Date:   Mon Mar 6 08:14:54 2023 +0100

    loading board now shows settings sidebar by default

commit 8d83fcf
Author: mauromiguelm <[email protected]>
Date:   Thu Mar 2 15:39:06 2023 +0100

    dev-`settings-container`
@ivokwee
Copy link
Member

ivokwee commented Mar 22, 2023

should we merge now or after Mauro's grid stuff?

@ivokwee
Copy link
Member

ivokwee commented Mar 22, 2023

I like the solution with multiple server, one ui. Once I thought to make a seperate MultiServer that takes multple plotmoduleservers but it seems not necessary. Your solution is enough. I would like to try this for the heatmap with the new plotly based and old heatmap.

@ESCRI11
Copy link
Contributor Author

ESCRI11 commented Mar 22, 2023

Yes, the heatmap would be a good candidate to try this out.

I was planning on waiting for Mauro grid stuff, but we can push this now too.

@mauromiguelm
Copy link
Contributor

I like this a lot, going to test it today! There are many interesting applications that comes to mind.

I think we can merge first Dev grid cards " #256 into master, and then merge this PR after that.

Or we can merge this PR into Dev grid cards " #256, and later to master.

Not sure what is more efficient, but we should do this asap before creating more conflicts.

@mauromiguelm
Copy link
Contributor

mauromiguelm commented Mar 24, 2023

The PR is for the backend tab option, right? I couldnt see any tab in loading module tsne plot.. or maybe its implemented and its just me that cannot see?

An interesting development would be to place the tab UI directly in the card header, see this example: https://rstudio.github.io/bslib/articles/cards.html#multiple-tabs

@ncullen93
Copy link
Contributor

Is this PR still relevant? If it is, let's take care of it. Otherwise, let's close :) @ESCRI11

@ivokwee
Copy link
Member

ivokwee commented Apr 6, 2023

Best is to be resubmit I guess. File names and locations have changed since the playbase merging.

@mauromiguelm mauromiguelm deleted the dev-`PlotModule_cards` branch April 12, 2023 07:22
@mauromiguelm mauromiguelm restored the dev-`PlotModule_cards` branch April 14, 2023 07:33
@ESCRI11 ESCRI11 reopened this Apr 14, 2023
@ESCRI11 ESCRI11 marked this pull request as ready for review April 30, 2023 23:29
@ESCRI11
Copy link
Contributor Author

ESCRI11 commented Apr 30, 2023

To be tested carefully (also by me)

@ESCRI11
Copy link
Contributor Author

ESCRI11 commented May 1, 2023

This PR will close #296

Copy link
Contributor

@mauromiguelm mauromiguelm left a comment

Choose a reason for hiding this comment

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

I really like the structure behind this, I have some minor comments to try to improve the current approach:

  • it would be nice to pass the PlotModuleServer "func" as an argument vector of multiple elements, where each element map to card_names in UI. That way we dont have to use PlotModuleServer twice.
  • Vertical distance in cards is reduced for showing card names, it would be nice to have a more minimal UI.
  • Sometimes option changes in Dynamic are not reflected in Static, for example the row clustering shows genes only in dynamic, but it varies in the static, with static having multiple labels. I think plots should show consistant information, and this might be a legacy issue unrelated to your PR. I guess an easy solution we could hide static row dendogram in case the clustering is the same.
  • Plots do not get to the bottom of card, this might have something to do with the fill behavior of the parent div, we can discuss a bit more if you wish, I think a solution is easy.

image

@ivokwee
Copy link
Member

ivokwee commented May 2, 2023

  1. I am fine with calling two plotmodules. I see no real advantage putting the extra func3 func4 inside.
  2. Vertical space. Would be nice to have the two subtabs either in the header, or type='hidden' and have the navigation buttons in the header or options (as in v2)
  3. Both plot should react on the same inputs of the plot options. I think that should be possible.
  4. Fill behaviour should be restores. I think it needs height to be set to 100%.

@ESCRI11
Copy link
Contributor Author

ESCRI11 commented May 2, 2023

  1. OK will leave it the structure as it is.
  2. I work on something like that, not 100% sure if it will work out.
  3. As long as the functions that generate the plots make proper use of the options, this is no issue, it has nothing to do with the PlotModule, although for this particular plot I can include the fix on the PR.
  4. Got it.

@ESCRI11
Copy link
Contributor Author

ESCRI11 commented May 2, 2023

Ok point 2 can be achieved easily, I have a working prototype (ugly but functional)

@ivokwee
Copy link
Member

ivokwee commented May 4, 2023

Ok point 2 can be achieved easily, I have a working prototype (ugly but functional)

Can you show? My idea was to use bslib::navs_hidden (see https://rstudio.github.io/bslib/reference/navs.html) and add somehow an actionButton in the drowdownmenu (or header?) that does something like updateTabPanel("card_selector", selected = "card1")

@ESCRI11
Copy link
Contributor Author

ESCRI11 commented May 4, 2023

@ivokwee Check the latest commit 8d1b84f. Basically I grab the "primitives": navList and content and place them on the header and body sepparately. I just have to make them inline and not affect the buttons.

@ivokwee
Copy link
Member

ivokwee commented May 4, 2023

@ivokwee Check the latest commit 8d1b84f. Basically I grab the "primitives": navList and content and place them on the header and body sepparately. I just have to make them inline and not affect the buttons.

Seems to work but the header fill is all over the place now. I guess the fillrow is not set properly if you have a varying number of elements or so. If not, you can rewrite fillrow with non-flexbox layout or add empty elements.

image

@ESCRI11
Copy link
Contributor Author

ESCRI11 commented May 4, 2023

Yep exactly, I am trying to figure out the best solution

@ESCRI11
Copy link
Contributor Author

ESCRI11 commented May 5, 2023

@ivokwee @mauromiguelm Please feel free to try the latest developments. Only thing missing is points 3 and 4, which should be easy.

image

@ESCRI11
Copy link
Contributor Author

ESCRI11 commented May 5, 2023

Only missing fixing the heatmap options so that in both plots are relevant. Also found a small bug affecting this new development and the plot editor, now fixed.

@mauromiguelm
Copy link
Contributor

mauromiguelm commented May 5, 2023

I really like this PR, it looks beautiful Xavier! I tested some of the option and it works quite nice, is there anything broken still?

I did two things (not yet pushed):

  • I reduced the font size of the tabs, do you like it?

image

  • create a small loop in the server so we dont call plotmoduleserver twice.. I think its a big more easy to understand, especially if we decide to have multiple plots in the future!

Let me know if I should push these two updates!

@ESCRI11
Copy link
Contributor Author

ESCRI11 commented May 6, 2023

Great! Good eye with the smaller font size. Please push the changes. I think we are ready for merge

@mauromiguelm
Copy link
Contributor

Done, I checked again and all looks good!

Problems related to the heatmaps:

  • absolute versus relative coloring between the two heatmaps are quite off, we should match color and outcomes as much as possible between the two heatmaps..
  • show legend is not working when we select split by phenotypes

This is kind of unrelated to this PR, we could merge and keep working these issues on #296, as we have other priorities

@ESCRI11
Copy link
Contributor Author

ESCRI11 commented May 6, 2023

Agreed. Let's finish this PR and solve heatmap problems as different issues

@ivokwee ivokwee merged commit e8653e6 into master May 8, 2023
@ivokwee ivokwee deleted the dev-`PlotModule_cards` branch May 8, 2023 14:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants