some cleanup, remove get_object_info from upa api - out of scope

kbase · Nov 4, 2017 · d9dec65 · d9dec65
1 parent e5557ff
commit d9dec65
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 195 deletions.
diff --git a/kbase-extension/static/kbase/js/api/upaApi.js b/kbase-extension/static/kbase/js/api/upaApi.js
@@ -1,13 +1,11 @@
 define([
-    'kbase-client-api'
-], function(kbaseClientApi) {
+], function() {
     'use strict';
 
-    var UpaApi = function(mainWorkspace, auth) {
+    var UpaApi = function(mainWorkspace) {
         var externalTag = '&',
             mainWs = String(mainWorkspace),
-            wsLen = mainWs.length,
-            authToken = auth ? auth.token : null;
+            wsLen = mainWs.length;
 
         /**
          * Runs a regex that tests the given string to see if it's a valid upa.
@@ -62,22 +60,10 @@ define([
             return deserial;
         };
 
-        /**
-         * @public
-         * @method
-         * When complete, will effectively wrap workspace.get_object_info3 to use upas/ headless
-         * upas. Might be redundant.
-         * TODO
-         */
-        var getObjectInfo = function(upa) {
-
-            return upa;
-        };
 
         return {
             serialize: serialize,
             deserialize: deserialize,
-            getObjectInfo: getObjectInfo,
             externalTag: externalTag
         };
     };

diff --git a/nbextensions/install.sh b/nbextensions/install.sh
@@ -11,13 +11,6 @@ export IPYTHONDIR=$narrdir/kbase-extension/ipython
 echo 'Root dir'
 echo ${dir}
 
-#jupyter nbextension disable appCell/main --sys-prefix
-#jupyter nbextension uninstall ${dir}/appCell --sys-prefix
-#jupyter nbextension install ${dir}/appCell --symlink --sys-prefix
-#jupyter nbextension enable appCell/main --sys-prefix
-
-#jupyter nbextension disable methodViewCell/main --sys-prefix
-#jupyter nbextension uninstall ${dir}/methodViewCell --sys-prefix
 jupyter nbextension install ${dir}/viewCell --symlink --sys-prefix
 jupyter nbextension enable viewCell/main --sys-prefix
 
@@ -38,9 +31,3 @@ jupyter nbextension enable advancedViewCell/main --sys-prefix
 
 jupyter nbextension install ${dir}/codeCell --symlink --sys-prefix
 jupyter nbextension enable codeCell/main --sys-prefix
-
-# jupyter nbextension disable codeCell/main --sys-prefix
-# jupyter nbextension install ${dir}/codeCell --symlink --sys-prefix
-
-#jupyter nbextension disable customView/main --sys-prefix
-#jupyter nbextension uninstall ${dir}/customView --sys-prefix
diff --git a/test/unit/spec/api/fileStagingSpec.js b/test/unit/spec/api/fileStagingSpec.js
diff --git a/test/unit/spec/api/upaApiSpec.js b/test/unit/spec/api/upaApiSpec.js
@@ -5,16 +5,12 @@
 /*jslint white: true*/
 
 define ([
-    'api/upaApi',
-    'narrativeConfig',
-    'testUtil'
+    'api/upaApi'
 ], function(
-    UpaApi,
-    Config,
-    TestUtil
+    UpaApi
 ) {
     'use strict';
-    describe('Test the Workspace object API', function() {
+    describe('Test the UPA API', function() {
 
         var mainWorkspace = '31',
             upaApi,
@@ -33,22 +29,16 @@ define ([
             }];
 
         beforeEach(function() {
-            if (TestUtil.getAuthToken()) {
-                upaApi = new UpaApi(mainWorkspace, {token: TestUtil.getAuthToken()});
-            }
+            upaApi = new UpaApi(mainWorkspace);
         });
 
         it('Should properly serialize an UPA from this workspace', function () {
-            TestUtil.pendingIfNoToken();
-
             testData.forEach(function(pair) {
                 expect(upaApi.serialize(pair.upa)).toBe(pair.serial);
             });
         });
 
         it('Should properly deserialize an UPA from this workspace', function () {
-            TestUtil.pendingIfNoToken();
-
             testData.forEach(function(pair) {
                 if (typeof pair.upa === 'string') {
                     expect(upaApi.deserialize(pair.serial)).toBe(pair.upa);
@@ -57,25 +47,16 @@ define ([
         });
 
         it('Should serialize an UPA from a different workspace', function () {
-            TestUtil.pendingIfNoToken();
-
             var upa = '1/2/3';
             expect(upaApi.serialize(upa)).toBe(upaApi.externalTag + upa);
         });
 
         it('Should deserialize an UPA from a different workspace', function() {
-            TestUtil.pendingIfNoToken();
-
             var upa = '1/2/3';
             var externalUpa = upaApi.externalTag + upa;
             expect(upaApi.deserialize(externalUpa)).toBe(upa);
         });
 
-        it('Should retrieve object info from an UPA (headless or not)', function () {
-            TestUtil.pendingIfNoToken();
-            // TODO
-        });
-
         it('Should fail to serialize a bad UPA', function () {
             try {
                 upaApi.serialize('not_an_upa');