Irrelevant interactor options for EHLDs are now disabled (grayed out)…

… in the settings options
reactome-pwp · Sep 20, 2017 · 5dbfb19 · 5dbfb19
1 parent f030498
commit 5dbfb19
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 8 deletions.
diff --git a/src/main/java/org/reactome/web/diagram/controls/settings/tabs/InteractorsTabPanel.java b/src/main/java/org/reactome/web/diagram/controls/settings/tabs/InteractorsTabPanel.java
@@ -149,7 +149,6 @@ public void run() {
         refreshTimer.scheduleRepeating(RESOURCES_REFRESH);
 
         updateCustomResources(ResourcesManager.get().getResources());
-        populateCustomResourceListPanel();
     }
 
     @Override
@@ -179,7 +178,12 @@ public void onContentRequested(ContentRequestedEvent event) {
     public void onContentLoaded(ContentLoadedEvent event) {
         if (event.getContext().getContent().getType() == DIAGRAM) {
             context = event.getContext();
+            enableStaticResourceBtn(true);
+        } else {
+            enableStaticResourceBtn(false);
+            populateResourceListPanel();
         }
+        populateCustomResourceListPanel();
     }
 
     @Override
@@ -348,6 +352,9 @@ private void populateResourceListPanel() {
                         summaryLb.setText("" + iContent.getUniqueRawInteractorsCountPerResource(resource.getIdentifier()));
                         row.add(summaryLb);
                     }
+                } else {
+                    radioBtn.setEnabled(false);
+                    radioBtn.addStyleName(RESOURCES.getCSS().interactorResourceListBtnDisabled());
                 }
 
                 liveResourcesFP.add(row);
@@ -385,6 +392,12 @@ public void onClick(ClickEvent clickEvent) {
                         }
                     }
                 });
+
+                if(context == null) {
+                    radioBtn.setEnabled(false);
+                    radioBtn.addStyleName(RESOURCES.getCSS().interactorResourceListBtnDisabled());
+                }
+
                 FlowPanel row = new FlowPanel();
                 row.add(radioBtn);
                 row.add(deleteBtn);
@@ -440,6 +453,15 @@ private void showLoading(boolean loading) {
         }
     }
 
+    private void enableStaticResourceBtn(boolean isEnabled){
+        staticResourceBtn.setEnabled(isEnabled);
+        if (isEnabled) {
+            staticResourceBtn.removeStyleName(RESOURCES.getCSS().interactorResourceBtnDisabled());
+        } else {
+            staticResourceBtn.addStyleName(RESOURCES.getCSS().interactorResourceBtnDisabled());
+        }
+    }
+
     /***
      * Enable the download button only if the rawInteractors mapset
      * for the selected resource contains entries
@@ -515,6 +537,8 @@ public interface ResourceCSS extends CssResource {
 
         String interactorResourceBtn();
 
+        String interactorResourceBtnDisabled();
+
         String liveResourcesOuterPanel();
 
         String liveResourcesInnerPanel();

diff --git a/src/main/resources/org/reactome/web/diagram/controls/settings/tabs/InteractorsTabPanel.css b/src/main/resources/org/reactome/web/diagram/controls/settings/tabs/InteractorsTabPanel.css
@@ -22,21 +22,22 @@
     margin-left: 10px;
     display: inline-block;
     width: 200px;
-    color:rgb(0, 90, 117);
+    color: white;
 }
 
-.interactorResourceBtn label{
+.interactorResourceBtn label {
     margin-left: 5px;
     cursor: pointer;
-    color: white;
 }
 
-.interactorResourceBtn:hover label{
-    margin-left: 5px;
-    cursor: pointer;
+.interactorResourceBtn:hover {
     color: rgb(6, 107, 158);
 }
 
+.interactorResourceBtnDisabled label {
+    color: dimgray;
+}
+
 .liveResourcesOuterPanel {
     height: 85px;
     width: 245px;
@@ -106,7 +107,8 @@
 }
 
 .interactorResourceListBtnDisabled{
-    width: 200px;
+    /*width: 200px;*/
+    color: dimgray;
 }
 
 .interactorResourceListBtnDisabled label{