Final tweaks for ver 1.6

ppernot · Mar 24, 2023 · 1173746 · 1173746
1 parent e81de28
commit 1173746
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 28 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -39,7 +39,7 @@ COPY ReactorUI/server_files /ReactorUI/server_files/
 COPY ReactorUI/R /ReactorUI/R/
 
 # Chemical database
-# ADD Reactor_Runs/ChemDB.tar.gz /
+ADD Reactor_Runs/ChemDB.tar.gz /
 
 # Add mounting point for local ChemDB
 RUN mkdir /ChemDBLocal

diff --git a/docker/commands.txt b/docker/commands.txt
@@ -4,7 +4,7 @@ SETUP :
 
 BUILD :
     1/ cd Titan-APSIS
-    2/ docker build -t ppernot1/reactorui:v1.5 -t ppernot1/reactorui:latest -f ReactorUI/docker/Dockerfile .
+    2/ docker build -t ppernot1/reactorui:v1.6 -t ppernot1/reactorui:latest -f ReactorUI/docker/Dockerfile .
     3/ docker push --all-tags ppernot1/reactorui
 
 RUN :

diff --git a/docker/test.sh b/docker/test.sh
@@ -2,7 +2,7 @@ docker kill reactorui
 docker rm reactorui
 
 cd ~/Bureau/Titan-APSIS/
-docker build -t ppernot1/reactorui:v1.5 -t ppernot1/reactorui:latest -f ReactorUI/docker/Dockerfile .
+docker build -t ppernot1/reactorui:v1.6 -t ppernot1/reactorui:latest -f ReactorUI/docker/Dockerfile .
 
 cd ~/Bureau/ChemDBTest/Projects/
 

diff --git a/server_files/analysis.R b/server_files/analysis.R
@@ -1,5 +1,3 @@
-speciesCategories = reactiveVal(NULL)
-
 # Functions ####
 getConc  = function(concThresh = -50) {
 

diff --git a/server_files/project.R b/server_files/project.R
@@ -14,6 +14,7 @@ statsList    = reactiveVal(NULL)
 fluxesList   = reactiveVal(NULL) # flMean, flSd...
 graphsList   = reactiveVal(NULL) # connectivity matrices :linksR, linksR2
 stoechList   = reactiveVal(NULL) # stoechiometry matrices: L, R
+speciesCategories = reactiveVal(NULL)
 
 # Open ####
 shinyFiles::shinyDirChoose(
@@ -41,6 +42,7 @@ observeEvent(
   fluxesList(NULL)
   graphsList(NULL)
   stoechList(NULL)
+  speciesCategories(NULL)
 
   if(input$newProj) {
 

diff --git a/server_files/run.R b/server_files/run.R
@@ -70,6 +70,7 @@ generateUpdatedControl = function() {
   writeLines(namelist, oldCtrl)
 }
 output$nMCRunSelect <- renderUI({
+  req(projectDir())
 
   # Max runs to max MC data samples
   InputMCDir = file.path(projectDir(),'MC_Input','Reactions')
@@ -242,6 +243,7 @@ observeEvent(
 running = reactiveVal(NULL)
 observeEvent(
   input$reactorRun, {
+    req(reacData())
 
     # Generate updated control.dat
     generateUpdatedControl()

diff --git a/ui.R b/ui.R
@@ -6,18 +6,16 @@ function(request) {
     )$value
   }
 
-  navbarPage(
-    "Reactor",
+  navbarPage(strong("Reactor"),
     theme = shinythemes::shinytheme(
       c("cosmo", "cerulean", "spacelab", "yeti")[3]
     ),
-    tags$head(tags$style(HTML("
-      hr {
-        height: 1px;
-        margin-top: 0.0em;
-        background: #666;
-      }"
-    ))),
+    selected = "Project", # The tag section takes the first entry
+    tags$head(
+      tags$style(
+        HTML("hr { height: 1px; margin-top: 0.0em; background: #666;}")
+      )
+    ),
     tabPanel(
       title = "Project",
       source_ui("project.R")
@@ -37,14 +35,6 @@ function(request) {
     tabPanel(
       title = "Fluxes",
       source_ui("fluxes.R")
-    )#,
-    # tabPanel(
-    #   title = "Downloads",
-    #   source_ui("downloads.R")
-    # ),
-    # tabPanel(
-    #   title = "About",
-    #   source_ui("about.R")
-    # )
+    )
   )
 }
diff --git a/ui_files/project.R b/ui_files/project.R
@@ -37,22 +37,19 @@ sidebarLayout(
       ),
       br(),br(),br(),
       wellPanel(
-        h4("About"),
+        strong("About"),
         hr(),
         h5("Author      : P. Pernot"),
         h5("Affiliation : ",a(href="https://www.cnrs.fr/","CNRS")),
         h5(paste0("Version     : ",version)),
-        # h5("Date        : 2022/09/19"),
+        a(href="https://ppernot.github.io/ReactorUI","User's manual"),
         br(),
         a(href="https://github.com/ppernot/ReactorUI","How to cite..."),
         br(),
         a(href="https://github.com/ppernot/ReactorUI","code@github"),
         br(),
         a(href="https://github.com/ppernot/ReactorUI/issues",
           "Bugs report, Features request"),
-        br(),
-        a(href="https://ppernot.github.io/ReactorUI",
-          "User's manual")
       )
     )
   ),