Merge pull request #2788 from kbase/develop

Merge version 5.0.2 for release
kbase · Feb 17, 2022 · fd55ea4 · fd55ea4
2 parents c41efc3 + a16ecd9
commit fd55ea4
Show file tree

Hide file tree

Showing 93 changed files with 6,961 additions and 9,962 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -4,6 +4,13 @@ The Narrative Interface allows users to craft KBase Narratives using a combinati
 
 This is built on the Jupyter Notebook v6.0.2 (more notes will follow).
 
+### Version 5.0.2
+- SAM-73 - Extends the ability to use app params as arguments for dynamic dropdown calls to inputs that are part of a struct or sequence.
+- DATAUP-696 - Prevent import specifications from being imported with either unknown data types, or data types not currently registered as using the bulk import cell.
+- DATAUP-715 - Adds scrollbars to the configure and results tab of the bulk import cell.
+- Fixed an error where Narrative names didn't always render properly in the Narratives panel.
+- Fixed an error where Narrative names didn't always render properly in the data slideout.
+
 ### Version 5.0.1
 - SAM-73 - Updated DynamicDropdownInput to have access to full list of other app parameters when user selects dropdown. If an app developer specified to use a certain value from a different field, the field as it currently exists will be used as a parameter.
 - Updated AppParamsWidget to return all current values from `get-parameters` if no specific value was specified, allowing to see all current parameter values without having to know their names.

diff --git a/kbase-extension/scss/partials/_bulkImportCell.scss b/kbase-extension/scss/partials/_bulkImportCell.scss
@@ -147,7 +147,14 @@ $panel-separator-color: use_color('mid-blue');
   }
 }
 
-.kb-result-tab,
+.kb-result-tab {
+  &__container {
+    @include default-container-padding;
+    overflow-y: auto;
+    max-height: 70rem;
+  }
+}
+
 .kb-job-status-tab {
   &__container {
     @include default-container-padding;

diff --git a/kbase-extension/scss/partials/_filePath.scss b/kbase-extension/scss/partials/_filePath.scss
@@ -5,6 +5,8 @@
     list-style-position: outside;
     list-style-type: none;
     padding: 0;
+    max-height: 60rem;
+    overflow-y: auto;
   }
 
   // .kb-file-path__list_item

diff --git a/kbase-extension/static/buildTools/loadAppWidgets.js b/kbase-extension/static/buildTools/loadAppWidgets.js
@@ -47,7 +47,6 @@ define([
     'widgets/appWidgets2/validators/sequence',
     'widgets/appWidgets2/validators/struct',
     'widgets/appWidgets2/validators/subdata',
-    'widgets/appWidgets2/validators/text',
     'widgets/appWidgets2/validators/workspaceObjectName',
     'widgets/appWidgets2/validators/workspaceObjectRef',
     'widgets/appWidgets2/view/autocompleteView',
@@ -91,7 +90,6 @@ define([
     'common/semaphore',
     'common/spec',
     'common/ui',
-    'common/validation',
     'util/util',
     'util/icon',
 ], () => {

diff --git a/kbase-extension/static/kbase/css/all_concat.css b/kbase-extension/static/kbase/css/all_concat.css
diff --git a/kbase-extension/static/kbase/css/all_concat.css.map b/kbase-extension/static/kbase/css/all_concat.css.map
diff --git a/kbase-extension/static/kbase/js/common/cellComponents/tabs/results/resultsTab.js b/kbase-extension/static/kbase/js/common/cellComponents/tabs/results/resultsTab.js
@@ -118,7 +118,11 @@ define(['bluebird', 'common/ui', 'common/events', './outputWidget', './reportWid
             const createdObjects = {};
             let objectKeys = [];
             return workspaceClient
-                .get_objects2({ objects: reportLookupParam, ignoreErrors: 1 })
+                .get_objects2({
+                    objects: reportLookupParam,
+                    ignoreErrors: 1,
+                    skip_external_system_updates: 1,
+                })
                 .then((reportData) => {
                     reportData.data.forEach((report, idx) => {
                         if (report !== null && 'objects_created' in report.data) {

diff --git a/kbase-extension/static/kbase/js/common/jobCommChannel.js b/kbase-extension/static/kbase/js/common/jobCommChannel.js
@@ -608,7 +608,7 @@ define([
                 'from biokbase.narrative.jobs.jobcomm import JobComm',
                 'cell_list = ' + JSON.stringify(currentCells),
                 // DATAUP-575: temporarily removing cell_list
-                'JobComm().start_job_status_loop(init_jobs=True)',
+                'JobComm().start_job_status_loop(cell_list=cell_list, init_jobs=True)',
             ].join('\n');
         }
     }