Merge pull request #1242 from briehl/develop

General Cleanup
kbase · Jan 25, 2018 · 6aa04e8 · 6aa04e8
2 parents debf2eb + 32a9f62
commit 6aa04e8
Show file tree

Hide file tree

Showing 10 changed files with 288 additions and 266 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -3,6 +3,21 @@ The Narrative Interface allows users to craft KBase Narratives using a combinati
 
 This is built on the Jupyter Notebook v4.4.1 (more notes will follow).
 
+### Version 3.6.0
+- SCT-400 - Deprecates the old Import panel, change text from "Staging (beta)" -> "Import (new)"
+- SCT-417
+  - All older Import functionality should now be available in the new Import panel.
+  - Adds a link to create an app for uploading from a public URL into the staging area.
+  - Cleans up unclear text in the new Import panel.
+  - Adds new (hopefully informative) steps to the Import panel tour.
+  - Move the 'decompress file' button so it should always be visible for archives.
+- PTV-225 - Add more icon clarity to the data sorting options.
+- PTV-886 - Restore missing scrollbar in the Narratives panel.
+- KBASE-5410 - Improve job log viewer, add different.
+- SCT-291 - Initial addition of tools for programmatically accessing the FTP file staging area.
+- SCT-405 - Custom compounds will now display properly in the media viewer.
+- KBASE-5417 - Fix long strings not wrapping correctly when showing object metadata in the Data panel.
+
 
 ### Version 3.5.2
 - PTV-682 - Fix problem with rendering a Pangenome widget in a copied Narrative.

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "kbase-narrative",
-  "version": "3.5.2",
+  "version": "3.6.0",
   "homepage": "https://kbase.us",
   "dependencies": {
     "bluebird": "3.4.7",

diff --git a/kbase-extension/static/kbase/css/kbaseNarrative.css b/kbase-extension/static/kbase/css/kbaseNarrative.css
@@ -1233,8 +1233,8 @@ div#notebook_panel {
     height: 100%;
 }
 .kb-narr-panel-body-wrapper {
-    height: calc(100% - 40px);
-    padding: 3px;
+    overflow-y: auto;
+    height: 100%;
 }
 .kb-narr-panel-body-wrapper > div{
     height: 100%;

diff --git a/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeDataList.js b/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeDataList.js
@@ -1410,9 +1410,22 @@ define([
                 .on('click', function () {
                     self.reverseData();
                     self.sortOrder *= -1;
-                    $upOrDown.find('.fa').toggleClass('fa-sort-amount-desc fa-sort-amount-asc');
+                    var $icon = $upOrDown.find('.fa');
+                    if ($icon.is('.fa-sort-amount-desc,.fa-sort-amount-asc')) {
+                        $icon.toggleClass('fa-sort-amount-desc fa-sort-amount-asc');
+                    }
+                    else {
+                        $icon.toggleClass('fa-sort-alpha-desc fa-sort-alpha-asc');
+                    }
                 });
 
+            var setSortIcon = function(newIcon) {
+                $upOrDown
+                    .find('.fa')
+                    .removeClass()
+                    .addClass('fa ' + newIcon);
+            }
+
             var $byDate = $('<label id="nar-data-list-default-sort-label" class="btn btn-default">').addClass('btn btn-default')
                 .append($('<input type="radio" name="options" id="nar-data-list-default-sort-option" autocomplete="off">'))
                 .append('date')
@@ -1421,6 +1434,7 @@ define([
                         return self.sortOrder * self.dataObjects[a.objId].info[3]
                             .localeCompare(self.dataObjects[b.objId].info[3]);
                     });
+                    setSortIcon(self.sortOrder > 0 ? 'fa-sort-amount-desc' : 'fa-sort-amount-asc');
                 });
 
             var $byName = $('<label class="btn btn-default">')
@@ -1431,6 +1445,7 @@ define([
                         return -1 * self.sortOrder * self.dataObjects[a.objId].info[1].toUpperCase()
                             .localeCompare(self.dataObjects[b.objId].info[1].toUpperCase());
                     });
+                    setSortIcon(self.sortOrder > 0 ? 'fa-sort-alpha-desc' : 'fa-sort-alpha-asc');
                 });
 
             var $byType = $('<label class="btn btn-default">')
@@ -1442,6 +1457,7 @@ define([
                         var bType = self.dataObjects[b.objId].info[2].toUpperCase().match(/\.(.+)/)[1];
                         return -1 * self.sortOrder * aType.localeCompare(bType);
                     });
+                    setSortIcon(self.sortOrder > 0 ? 'fa-sort-alpha-desc' : 'fa-sort-alpha-asc');
                 });
 
 

diff --git a/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeSidePanel.js b/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeSidePanel.js
@@ -56,23 +56,22 @@ define(
             init: function(options) {
                 this._super(options);
                 var analysisWidgets = this.buildPanelSet([{
-                        name: 'kbaseNarrativeDataPanel',
-                        params: {
-                            collapseCallback: $.proxy(function(isMinimized) {
-                                this.handleMinimizedDataPanel(isMinimized);
-                            }, this)
-                        }
-                    },
-                    {
-                        name: 'kbaseNarrativeAppPanel',
-                        params: {
-                            autopopulate: false,
-                            collapseCallback: $.proxy(function(isMinimized) {
-                                this.handleMinimizedMethodPanel(isMinimized);
-                            }, this)
-                        }
+                    name: 'kbaseNarrativeDataPanel',
+                    params: {
+                        collapseCallback: $.proxy(function(isMinimized) {
+                            this.handleMinimizedDataPanel(isMinimized);
+                        }, this)
                     }
-                ]);
+                },
+                {
+                    name: 'kbaseNarrativeAppPanel',
+                    params: {
+                        autopopulate: false,
+                        collapseCallback: $.proxy(function(isMinimized) {
+                            this.handleMinimizedMethodPanel(isMinimized);
+                        }, this)
+                    }
+                }]);
                 this.$dataWidget = analysisWidgets['kbaseNarrativeDataPanel'];
                 this.$methodsWidget = analysisWidgets['kbaseNarrativeAppPanel'];
 
@@ -94,17 +93,16 @@ define(
                 var $jobsPanel = jobsWidget['panelSet'];
 
                 this.$tabs = this.buildTabs([{
-                        tabName: 'Analyze',
-                        content: $analysisPanel
-                    },
-                    {
-                        tabName: 'Narratives',
-                        content: $managePanel
-                    },
-                    // {
-                    //     tabName : this.$jobsWidget.title,
-                    //     content: $jobsPanel
-                    // }
+                    tabName: 'Analyze',
+                    content: $analysisPanel
+                }, {
+                    tabName: 'Narratives',
+                    content: $managePanel
+                },
+                // {
+                //     tabName : this.$jobsWidget.title,
+                //     content: $jobsPanel
+                // }
                 ], true);
 
                 this.$elem.addClass('kb-side-panel');
@@ -129,11 +127,8 @@ define(
 
                 if (this.autorender) {
                     this.render();
-                } else {
-
                 }
 
-
                 return this;
             },
 
@@ -404,11 +399,9 @@ define(
                 this.$jobsWidget.setHeight(fullSize);
             },
 
-
             render: function() {
                 this.initOverlay();
-                // this.$methodsWidget.refreshFromService();
             }
 
-        })
-    });
+        });
+    });
diff --git a/kbase-extension/static/kbase/js/widgets/narrative_core/upload/stagingAreaViewer.js b/kbase-extension/static/kbase/js/widgets/narrative_core/upload/stagingAreaViewer.js
@@ -92,7 +92,6 @@ define([
         },
 
         updateView: function() {
-            console.log("UPDATING VIEW");
             return this.stagingServiceClient.list({path: this.subpath})
                 .then(function(data) {
                     var files = JSON.parse(data);

diff --git a/kbase-extension/static/kbase/js/widgets/narrative_core/upload/uploadTour.js b/kbase-extension/static/kbase/js/widgets/narrative_core/upload/uploadTour.js
@@ -78,7 +78,6 @@ define([
         if (!useGlobus) {
             this.tour_steps.splice(2, 1);
         }
-        console.log("BUILDING NEW TOUR");
 
         this.tour = new Tour({
             storage: false, // start tour from beginning every time

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "kbase-narrative-core",
   "description": "Core components for the KBase Narrative Interface",
-  "version": "3.5.2",
+  "version": "3.6.0",
   "private": true,
   "repository": "github.com/kbase/narrative",
   "devDependencies": {

diff --git a/src/biokbase/narrative/__init__.py b/src/biokbase/narrative/__init__.py
@@ -1,7 +1,7 @@
 __all__ = ['magics', 'ws_util', 'common', 'handlers', 'contents', 'services', 'widgetmanager']
 
 from semantic_version import Version
-__version__ = Version("3.5.2")
+__version__ = Version("3.6.0")
 version = lambda: __version__
 
 # if run directly: