Merge pull request #130 from xchem/pagination

revert back to syntax for paginated view responses
xchem · Dec 27, 2018 · 0813139 · 0813139
2 parents e064500 + 1d14c4d
commit 0813139
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,8 +2,8 @@ language: node_js
 node_js:
   - "8"
 script:
-  - npm run build && npm test
-after_success:
-  - if [ "$TRAVIS_BRANCH" == "master" ]; then
-    npm run-script build;
-    fi
+  - npm install && npm test
+#after_success:
+#  - if [ "$TRAVIS_BRANCH" == "master" ]; then
+#    npm run-script build;
+#    fi
diff --git a/js/components/downloadPdb.js b/js/components/downloadPdb.js
@@ -19,10 +19,10 @@ class DownloadPdb extends React.Component {
         var proteinsUrl = window.location.protocol + "//" + window.location.host + "/api/proteins/?target_id=" + this.props.targetOn.toString();
         const protResponse = await fetch(proteinsUrl);
         const protJson = await protResponse.json();
-        const protInfo = protJson;
+        const protInfo = protJson.results;
         const pdbResponse = await fetch(protPdbUrl);
         const pdbJson = await pdbResponse.json();
-        const pdbInfo = pdbJson;
+        const pdbInfo = pdbJson.results;
         var zip = new JSZip();
         const timeOptions = {year: 'numeric', month: 'short', day: '2-digit'};
         var fName = this.props.targetOnName + "_allPdb_" + new Intl.DateTimeFormat('en-GB', timeOptions).format(Date.now()).replace(/\s/g, '-');

diff --git a/js/components/generalComponents.js b/js/components/generalComponents.js
@@ -111,7 +111,7 @@ export class GenericList extends React.Component {
      * @returns {*}
      */
     processResults(json) {
-        var results = json;
+        var results = json.results;
         this.afterPush(results)
         if (this.list_type == listTypes.SESSIONS && this.props.seshListSaving == true) {this.props.setSeshListSaving(false)}
         return results;

diff --git a/js/components/hotspotList.js b/js/components/hotspotList.js
@@ -36,7 +36,7 @@ class HotspotList extends GenericList {
             }
         })
         var myJson = await response.json();
-        this.setState(prevState => ({hsCount: myJson.length}));
+        this.setState(prevState => ({hsCount: myJson.count}));
         }
     }
 

diff --git a/js/components/hotspotView.js b/js/components/hotspotView.js
@@ -83,12 +83,12 @@ class HotspotView extends React.Component {
             return response.json();
         }).then(function (myJson) {
             var hotspotObject = {
-                "name": "HOTSPOT_" + myJson[0].prot_id.toString() + mapType + isoLevel,
-                "hotUrl": myJson[0].map_info.replace("http:",window.location.protocol),
+                "name": "HOTSPOT_" + myJson.results[0].prot_id.toString() + mapType + isoLevel,
+                "hotUrl": myJson.results[0].map_info.replace("http:",window.location.protocol),
                 "display_div": "major_view",
                 "OBJECT_TYPE": nglObjectTypes.HOTSPOT,
-                "map_type": myJson[0].map_type.toString(),
-                "fragment": myJson[0].prot_id.toString(),
+                "map_type": myJson.results[0].map_type.toString(),
+                "fragment": myJson.results[0].prot_id.toString(),
                 "isoLevel": isoLevel,
                 "opacity": opacity,
                 "disablePicking": true

diff --git a/js/components/modalStateSave.js b/js/components/modalStateSave.js
@@ -79,7 +79,7 @@ export class ModalStateSave extends Component {
         }).then(function (response) {
             return response.json();
         }).then(function (myJson) {
-            var getTitle = myJson[JSON.stringify(0)].title;
+            var getTitle = myJson.results[JSON.stringify(0)].title;
             _this.props.setSessionTitle(getTitle);
             return getTitle;
         }).then(getTitle => this.setState(prevState => ({title: getTitle})))

diff --git a/js/components/refinementOutcome.js b/js/components/refinementOutcome.js
@@ -11,23 +11,23 @@ class RefinementOutcome extends React.Component{
 
     constructor(props) {
         super(props);
-        var base_url = window.location.protocol + "//" + window.location.host
+        var base_url = window.location.protocol + "//" + window.location.host;
         this.base_url = base_url;
         this.getUrl = this.getUrl.bind(this);
         this.state = {refinementOutcome: undefined}
     }
 
     getUrl() {
-        var get_view = "/api/molannotation/?mol_id=" + this.props.data.id.toString()
+        var get_view = "/api/molannotation/?mol_id=" + this.props.data.id.toString();
         return new URL(this.base_url + get_view)
     }
 
     convertJson(input_json){
-        var results = input_json
+        var results = input_json["results"];
         for (var index in results){
             var result = results[index];
             if (result["annotation_type"]=="ligand_confidence"){
-                var result_text = result["annotation_text"]
+                var result_text = result["annotation_text"];
                 var int_conf = parseInt(result_text);
             }
         }

diff --git a/js/components/sessionManagement.js b/js/components/sessionManagement.js
@@ -252,7 +252,7 @@ export class SessionManagement extends React.Component {
         }).then(function (response) {
             return response.json();
         }).then(function (myJson) {
-            var title = myJson[JSON.stringify(0)].title;
+            var title = myJson.results[JSON.stringify(0)].title;
             return title;
         }).then(title => this.props.setSessionTitle(title))
     }
@@ -264,7 +264,7 @@ export class SessionManagement extends React.Component {
             fetch("/api/viewscene/?uuid="+this.props.uuid)
                 .then(function(response) {
                     return response.json();
-                }).then(json => this.handleJson(json[0]))
+                }).then(json => this.handleJson(json.results[0]))
             this.props.setUuid("UNSET");
         }
         for (var key in this.props.nglOrientations){

diff --git a/js/containers/previewHolder.js b/js/containers/previewHolder.js
@@ -47,7 +47,7 @@ class Preview extends Component {
         this.props.setTargetUnrecognised(targetUnrecognised);
         fetch(window.location.protocol + "//" + window.location.host+"/api/targets/?title="+target)
             .then(response => response.json())
-            .then(json => this.props.setTargetOn(json[0].id))
+            .then(json => this.props.setTargetOn(json["results"][0].id))
             .catch((error) => {
                     this.deployErrorModal(error);
                 })