Merge pull request #3600 from kbase/UIP-46-die-cleanup

UIP-46 remove final vestiges of DIE
kbase · Jul 16, 2024 · 7cd2a51 · 7cd2a51
2 parents 1d2b3d7 + 9b17638
commit 7cd2a51
Show file tree

Hide file tree

Showing 15 changed files with 47 additions and 66 deletions.
diff --git a/docs/developer/widget_helper_modules.md b/docs/developer/widget_helper_modules.md
@@ -21,7 +21,6 @@ This replies with the currently configured service (or other) url endpoints. Sup
 ```
 awe
 catalog
-data_import_export
 fba
 feature_values
 gene_families

diff --git a/kbase-extension/scss/all_concat.scss b/kbase-extension/scss/all_concat.scss
@@ -37,6 +37,7 @@
 @import "partials/bulkImportCell";
 @import "partials/cellToolbar";
 @import "partials/dataStaging";
+@import "partials/downloadPanel";
 @import "partials/dropzoneDz";
 @import "partials/errorDisplay";
 @import "partials/errorMessage";

diff --git a/kbase-extension/scss/partials/_downloadPanel.scss b/kbase-extension/scss/partials/_downloadPanel.scss
@@ -0,0 +1,27 @@
+.kb-download-panel {
+    display: flex;
+
+    // .kb-download-panel__label
+    &__label {
+        white-space: nowrap;
+        padding: 1px;
+        align-self: center;
+    }
+
+    // .kb-download-panel__buttons
+    &__buttons {
+        text-align: left;
+        padding: 1px;
+    }
+
+    // .kb-download-panel__status
+    &__status {
+        margin: 15px;
+        word-wrap: wrap-word;
+        overflow: none;
+
+        &__error {
+            color: use-color('error');
+        }
+    }
+}
diff --git a/kbase-extension/static/kbase/config/cdn-service-config.json b/kbase-extension/static/kbase/config/cdn-service-config.json
@@ -8,10 +8,6 @@
             "url": "https://kbase.us/services/cdmi_api",
             "name": "CDMI"
         },
-        "data_import_export": {
-            "url": "https://ci.kbase.us/services/data_import_export",
-            "name": "Data Import Export"
-        },
         "fba": {
             "url": "https://ci.kbase.us/services/KBaseFBAModeling",
             "name": "FBA"
@@ -147,4 +143,4 @@
         "icon": "flask",
         "name": "Continuous Integration"
     }
-}
+}
diff --git a/kbase-extension/static/kbase/config/services-appdev.json b/kbase-extension/static/kbase/config/services-appdev.json
@@ -8,10 +8,6 @@
             "url": "https://kbase.us/services/cdmi_api",
             "name": "CDMI"
         },
-        "data_import_export": {
-            "url": "https://kbase.us/services/data_import_export",
-            "name": "Data Import Export"
-        },
         "fba": {
             "url": "https://kbase.us/services/KBaseFBAModeling",
             "name": "FBA"
@@ -151,4 +147,4 @@
         "icon": "wrench",
         "name": "App Dev"
     }
-}
+}
diff --git a/kbase-extension/static/kbase/config/services-ci.json b/kbase-extension/static/kbase/config/services-ci.json
@@ -8,10 +8,6 @@
             "url": "https://kbase.us/services/cdmi_api",
             "name": "CDMI"
         },
-        "data_import_export": {
-            "url": "https://ci.kbase.us/services/data_import_export",
-            "name": "Data Import Export"
-        },
         "fba": {
             "url": "https://ci.kbase.us/services/KBaseFBAModeling",
             "name": "FBA"
@@ -151,4 +147,4 @@
         "icon": "flask",
         "name": "Continuous Integration"
     }
-}
+}
diff --git a/kbase-extension/static/kbase/config/services-local-dev.json b/kbase-extension/static/kbase/config/services-local-dev.json
@@ -8,10 +8,6 @@
             "url": "https://kbase.us/services/cdmi_api",
             "name": "CDMI"
         },
-        "data_import_export": {
-            "url": "https://ci.kbase.us/services/data_import_export",
-            "name": "Data Import Export"
-        },
         "fba": {
             "url": "https://ci.kbase.us/services/KBaseFBAModeling",
             "name": "FBA"
@@ -151,4 +147,4 @@
         "icon": "paper-plane",
         "name": "Local Development"
     }
-}
+}
diff --git a/kbase-extension/static/kbase/config/services-next.json b/kbase-extension/static/kbase/config/services-next.json
@@ -8,10 +8,6 @@
             "url": "https://kbase.us/services/cdmi_api",
             "name": "CDMI"
         },
-        "data_import_export": {
-            "url": "https://next.kbase.us/services/data_import_export",
-            "name": "Data Import Export"
-        },
         "fba": {
             "url": "https://next.kbase.us/services/KBaseFBAModeling",
             "name": "FBA"
@@ -151,4 +147,4 @@
         "icon": "bullseye",
         "name": "Next"
     }
-}
+}
diff --git a/kbase-extension/static/kbase/config/services-prod.json b/kbase-extension/static/kbase/config/services-prod.json
@@ -8,10 +8,6 @@
             "url": "https://kbase.us/services/cdmi_api",
             "name": "CDMI"
         },
-        "data_import_export": {
-            "url": "https://kbase.us/services/data_import_export",
-            "name": "Data Import Export"
-        },
         "fba": {
             "url": "https://kbase.us/services/KBaseFBAModeling",
             "name": "FBA"
@@ -151,4 +147,4 @@
         "icon": "thumbs-up",
         "name": "Production"
     }
-}
+}
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/widgets/narrative_core/kbaseNarrativeDownloadPanel.js b/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeDownloadPanel.js
@@ -92,26 +92,19 @@ define([
         },
 
         renderStructure: function () {
-            const $container = $('<div>');
-            const $label = $('<div>')
-                .addClass('kb-download-label')
-                .css({ 'white-space': 'nowrap', padding: '1px', 'align-self': 'center' })
-                .append('Export as:');
-            const $buttons = $('<div>')
-                .addClass('kb-download-buttons')
-                .css({ padding: '1px', 'text-align': 'left' });
-            $container.css({ display: 'flex' }).append($label).append($buttons);
+            const $container = $('<div>').addClass('kb-download-panel');
+            const $label = $('<div>').addClass('kb-download-panel__label').append('Export as:');
+            const $buttons = $('<div>').addClass('kb-download-panel__buttons');
+            $container.append($label).append($buttons);
 
             this.$elem.append($container);
-            this.$statusDiv = $('<div>')
-                .addClass('kb-download-status')
-                .css({ margin: '15px', 'word-wrap': 'wrap-word', overflow: 'none' });
+            this.$statusDiv = $('<div>').addClass('kb-download-panel__status');
             this.$elem.append(this.$statusDiv.hide());
         },
 
         renderDownloadButtons: function () {
             const downloaders = this.prepareDownloaders(this.type);
-            const $btnPanel = this.$elem.find('.kb-download-buttons');
+            const $btnPanel = this.$elem.find('.kb-download-panel__buttons');
             downloaders.forEach((dlInfo) => {
                 if (dlInfo.name.toLocaleLowerCase() === 'staging') {
                     $btnPanel.append(
@@ -281,7 +274,7 @@ define([
             this.$elem.find('.kb-data-list-btn').prop('disabled', false);
             this.$statusDiv.empty().append(
                 $('<span>')
-                    .css({ color: '#F44336' })
+                    .addClass('kb-download-panel__status_error')
                     .append('Error: ' + error)
             );
         },

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/config.json b/src/config.json
@@ -6,7 +6,6 @@
         "catalog": "https://appdev.kbase.us/services/catalog",
         "cdn": "https://appdev.kbase.us/cdn/files",
         "compound_img_url": "http://minedatabase.mcs.anl.gov/compound_images/ModelSEED/",
-        "data_import_export": "https://appdev.kbase.us/services/data_import_export",
         "data_panel_sources": "/data_source_config.json",
         "execution_engine2": "https://appdev.kbase.us/services/ee2",
         "fba": "https://appdev.kbase.us/services/KBaseFBAModeling/",
@@ -60,7 +59,6 @@
         "catalog": "https://ci.kbase.us/services/catalog",
         "cdn": "https://ci.kbase.us/cdn/files",
         "compound_img_url": "http://minedatabase.mcs.anl.gov/compound_images/ModelSEED/",
-        "data_import_export": "https://ci.kbase.us/services/data_import_export",
         "data_panel_sources": "/data_source_config.json",
         "execution_engine2": "https://ci.kbase.us/services/ee2",
         "fba": "https://ci.kbase.us/services/KBaseFBAModeling/",
@@ -126,7 +124,6 @@
         "catalog": "https://ci.kbase.us/services/catalog",
         "cdn": "https://ci.kbase.us/cdn/files",
         "compound_img_url": "http://minedatabase.mcs.anl.gov/compound_images/ModelSEED/",
-        "data_import_export": "https://ci.kbase.us/services/data_import_export",
         "data_panel_sources": "/data_source_config.json",
         "execution_engine2": "https://ci.kbase.us/services/ee2",
         "fba": "https://ci.kbase.us/services/KBaseFBAModeling/",
@@ -182,7 +179,6 @@
         "catalog": "https://next.kbase.us/services/catalog",
         "cdn": "https://next.kbase.us/cdn/files",
         "compound_img_url": "http://minedatabase.mcs.anl.gov/compound_images/ModelSEED/",
-        "data_import_export": "https://next.kbase.us/services/data_import_export",
         "data_panel_sources": "/data_source_config.json",
         "execution_engine2": "https://next.kbase.us/services/ee2",
         "fba": "https://next.kbase.us/services/KBaseFBAModeling/",
@@ -234,7 +230,6 @@
         "catalog": "https://kbase.us/services/catalog",
         "cdn": "https://kbase.us/cdn/files",
         "compound_img_url": "http://minedatabase.mcs.anl.gov/compound_images/ModelSEED/",
-        "data_import_export": "https://kbase.us/services/data_import_export",
         "data_panel_sources": "/data_source_config.json",
         "execution_engine2": "https://kbase.us/services/ee2-nr",
         "fba": "https://kbase.us/services/KBaseFBAModeling/",
@@ -288,7 +283,6 @@
         "catalog": "https://narrative-dev.kbase.us/services/catalog",
         "cdn": "https://narrative-dev.kbase.us/cdn/files",
         "compound_img_url": "http://minedatabase.mcs.anl.gov/compound_images/ModelSEED/",
-        "data_import_export": "https://narrative-dev.kbase.us/services/data_import_export",
         "data_panel_sources": "/data_source_config.json",
         "execution_engine2": "https://narrative-dev.kbase.us/services/ee2",
         "fba": "https://narrative-dev.kbase.us/services/KBaseFBAModeling/",
@@ -341,7 +335,6 @@
         "catalog": "https://narrative-refactor.kbase.us/services/catalog",
         "cdn": "https://narrative-refactor.kbase.us/cdn/files",
         "compound_img_url": "http://minedatabase.mcs.anl.gov/compound_images/ModelSEED/",
-        "data_import_export": "https://narrative-refactor.kbase.us/services/data_import_export",
         "data_panel_sources": "/data_source_config.json",
         "execution_engine2": "https://narrative-refactor.kbase.us/services/ee2-nr",
         "fba": "https://narrative-refactor.kbase.us/services/KBaseFBAModeling/",

diff --git a/src/config.json.templ b/src/config.json.templ
@@ -6,7 +6,6 @@
         "catalog": "https://appdev.kbase.us/services/catalog",
         "cdn": "https://appdev.kbase.us/cdn/files",
         "compound_img_url": "http://minedatabase.mcs.anl.gov/compound_images/ModelSEED/",
-        "data_import_export": "https://appdev.kbase.us/services/data_import_export",
         "data_panel_sources": "/data_source_config.json",
         "execution_engine2": "https://appdev.kbase.us/services/ee2",
         "fba": "https://appdev.kbase.us/services/KBaseFBAModeling/",
@@ -60,7 +59,6 @@
         "catalog": "https://ci.kbase.us/services/catalog",
         "cdn": "https://ci.kbase.us/cdn/files",
         "compound_img_url": "http://minedatabase.mcs.anl.gov/compound_images/ModelSEED/",
-        "data_import_export": "https://ci.kbase.us/services/data_import_export",
         "data_panel_sources": "/data_source_config.json",
         "execution_engine2": "https://ci.kbase.us/services/ee2",
         "fba": "https://ci.kbase.us/services/KBaseFBAModeling/",
@@ -126,7 +124,6 @@
         "catalog": "https://ci.kbase.us/services/catalog",
         "cdn": "https://ci.kbase.us/cdn/files",
         "compound_img_url": "http://minedatabase.mcs.anl.gov/compound_images/ModelSEED/",
-        "data_import_export": "https://ci.kbase.us/services/data_import_export",
         "data_panel_sources": "/data_source_config.json",
         "execution_engine2": "https://ci.kbase.us/services/ee2",
         "fba": "https://ci.kbase.us/services/KBaseFBAModeling/",
@@ -182,7 +179,6 @@
         "catalog": "https://next.kbase.us/services/catalog",
         "cdn": "https://next.kbase.us/cdn/files",
         "compound_img_url": "http://minedatabase.mcs.anl.gov/compound_images/ModelSEED/",
-        "data_import_export": "https://next.kbase.us/services/data_import_export",
         "data_panel_sources": "/data_source_config.json",
         "execution_engine2": "https://next.kbase.us/services/ee2",
         "fba": "https://next.kbase.us/services/KBaseFBAModeling/",
@@ -234,7 +230,6 @@
         "catalog": "https://kbase.us/services/catalog",
         "cdn": "https://kbase.us/cdn/files",
         "compound_img_url": "http://minedatabase.mcs.anl.gov/compound_images/ModelSEED/",
-        "data_import_export": "https://kbase.us/services/data_import_export",
         "data_panel_sources": "/data_source_config.json",
         "execution_engine2": "https://kbase.us/services/ee2",
         "fba": "https://kbase.us/services/KBaseFBAModeling/",
@@ -288,7 +283,6 @@
         "catalog": "https://narrative-dev.kbase.us/services/catalog",
         "cdn": "https://narrative-dev.kbase.us/cdn/files",
         "compound_img_url": "http://minedatabase.mcs.anl.gov/compound_images/ModelSEED/",
-        "data_import_export": "https://narrative-dev.kbase.us/services/data_import_export",
         "data_panel_sources": "/data_source_config.json",
         "execution_engine2": "https://narrative-dev.kbase.us/services/ee2",
         "fba": "https://narrative-dev.kbase.us/services/KBaseFBAModeling/",
@@ -341,7 +335,6 @@
         "catalog": "https://narrative-refactor.kbase.us/services/catalog",
         "cdn": "https://narrative-refactor.kbase.us/cdn/files",
         "compound_img_url": "http://minedatabase.mcs.anl.gov/compound_images/ModelSEED/",
-        "data_import_export": "https://narrative-refactor.kbase.us/services/data_import_export",
         "data_panel_sources": "/data_source_config.json",
         "execution_engine2": "https://narrative-refactor.kbase.us/services/ee2-nr",
         "fba": "https://narrative-refactor.kbase.us/services/KBaseFBAModeling/",
-Original file line number
+Diff line change
@@ Expand Up @@
     ```
     awe
     catalog
-    data_import_export
     fba
     feature_values
     gene_families
@@ Expand Down @@