From bfb1f4d83ceb8e65467e7d8045c179e86ddf24cd Mon Sep 17 00:00:00 2001
From: DanialBetres <dbetres@uwaterloo.ca>
Date: Thu, 17 Oct 2019 14:19:02 -0500
Subject: [PATCH] HUB-248 long query text (#29)

* Replace agent id and dataset id for dataset

* use savedQueryId to fetch results

* Remove all instances of agentid and datasetid

* Fix sample queries loading in chart builder

* Update example link
---
 src/components/Header.js                      | 10 ++--
 src/components/__tests__/Header.spec.js       |  4 +-
 .../__snapshots__/Header.spec.js.snap         |  6 +--
 src/util/Store.js                             | 50 ++++++-------------
 src/util/__test__/Store.spec.js               | 33 ++----------
 .../__test__/__snapshots__/Store.spec.js.snap |  3 +-
 src/views/App.js                              | 42 ++++++++++------
 src/views/StateRestorationGate.js             |  3 +-
 8 files changed, 54 insertions(+), 97 deletions(-)

diff --git a/src/components/Header.js b/src/components/Header.js
index de7e4d0..17d758f 100644
--- a/src/components/Header.js
+++ b/src/components/Header.js
@@ -11,19 +11,17 @@ class Header extends Component<{
 }> {
   render() {
     const { store } = this.props
-    const { agentid, datasetid } = store
+    const { dataset } = store
 
-    const hasContext = !!(agentid && datasetid)
+    const hasContext = !!dataset
 
     const href = hasContext
-      ? `https://data.world/${agentid}/${datasetid}`
+      ? `https://data.world/${dataset}`
       : 'https://data.world'
 
     const headerText = hasContext ? (
       <Fragment>
-        <span style={{ color: 'white' }}>
-          {agentid}/{datasetid}
-        </span>
+        <span style={{ color: 'white' }}>{dataset}</span>
         <span style={{ color: '#a3afbf' }}>/chart-builder</span>
       </Fragment>
     ) : (
diff --git a/src/components/__tests__/Header.spec.js b/src/components/__tests__/Header.spec.js
index ebd8cb3..22bbc87 100644
--- a/src/components/__tests__/Header.spec.js
+++ b/src/components/__tests__/Header.spec.js
@@ -12,10 +12,10 @@ it('renders', () => {
   snap(<Header store={store} />)
 })
 
-it('renders with agentid/datasetid', () => {
+it('renders with dataset', () => {
   const store = Store.create({
     location: {
-      search: 'agentid=foo&datasetid=bar'
+      search: 'dataset=foo/bar'
     }
   })
 
diff --git a/src/components/__tests__/__snapshots__/Header.spec.js.snap b/src/components/__tests__/__snapshots__/Header.spec.js.snap
index 32a1dab..19d1d44 100644
--- a/src/components/__tests__/__snapshots__/Header.spec.js.snap
+++ b/src/components/__tests__/__snapshots__/Header.spec.js.snap
@@ -67,7 +67,7 @@ exports[`renders 1`] = `
 </nav>
 `;
 
-exports[`renders with agentid/datasetid 1`] = `
+exports[`renders with dataset 1`] = `
 <nav
   className="navbar navbar-inverse navbar-static-top"
   style={
@@ -116,9 +116,7 @@ exports[`renders with agentid/datasetid 1`] = `
             }
           }
         >
-          foo
-          /
-          bar
+          foo/bar
         </span>
         <span
           style={
diff --git a/src/util/Store.js b/src/util/Store.js
index de939d9..6902a95 100644
--- a/src/util/Store.js
+++ b/src/util/Store.js
@@ -342,12 +342,11 @@ export type StoreType = {
 
   // views
   parsedUrlQuery: Object,
-  possibleResourceFromQuery: ?{ agentid: string, datasetid: string },
   hasValidParams: boolean,
-  agentid: string,
-  datasetid: string,
   query: string,
   queryType: 'sql' | 'sparql',
+  savedQueryId: string | null,
+  dataset: string,
 
   // actions
   syncQueryParams: Object => void,
@@ -369,45 +368,13 @@ const Store: ModelType<StoreType> = types
   })
   .views((self: StoreType) => ({
     get hasValidParams() {
-      return !!self.agentid && !!self.datasetid && !!self.query
+      return !!self.dataset && (!!self.query || !!self.savedQueryId)
     },
 
     get parsedUrlQuery() {
       return parseParams(self.location.search)
     },
 
-    /*
-      support 3 types of passing resource:
-      dataset=<agentid>/<datasetid>
-      project=<agentid>/<datasetid>
-      agentid=<agentid>&datasetid=<datasetid>
-
-      they're preferred in that order
-    */
-    get possibleResourceFromQuery() {
-      const resource: ?string =
-        self.parsedUrlQuery.dataset || self.parsedUrlQuery.project
-      if (resource != null) {
-        const [agentid, datasetid] = resource.split('/')
-        if (agentid && datasetid) {
-          return { agentid, datasetid }
-        }
-      }
-      return null
-    },
-
-    get agentid() {
-      const resource = self.possibleResourceFromQuery
-      if (resource) return resource.agentid
-
-      return self.parsedUrlQuery.agentid
-    },
-    get datasetid() {
-      const resource = self.possibleResourceFromQuery
-      if (resource) return resource.datasetid
-
-      return self.parsedUrlQuery.datasetid
-    },
     get query() {
       return self.parsedUrlQuery.query
     },
@@ -418,6 +385,17 @@ const Store: ModelType<StoreType> = types
         if (lowered === 'sql' || lowered === 'sparql') return lowered
       }
       return 'sql'
+    },
+    get savedQueryId() {
+      const providedSavedQueryId = self.parsedUrlQuery.saved_query
+      if (!providedSavedQueryId) {
+        return null
+      }
+      return providedSavedQueryId
+    },
+    get dataset() {
+      const providedDataset = self.parsedUrlQuery.dataset
+      return providedDataset
     }
   }))
   .actions((self: StoreType) => ({
diff --git a/src/util/__test__/Store.spec.js b/src/util/__test__/Store.spec.js
index 124ae62..a549444 100644
--- a/src/util/__test__/Store.spec.js
+++ b/src/util/__test__/Store.spec.js
@@ -10,13 +10,12 @@ describe('Store', () => {
   it('detects valid params', () => {
     const store = Store.create({
       location: {
-        search: 'agentid=foo&datasetid=bar&query=select'
+        search: 'dataset=foo/bar&query=select'
       }
     })
     expect(store.hasValidParams).toBe(true)
     expect({
-      agentid: store.agentid,
-      datasetid: store.datasetid,
+      dataset: store.dataset,
       query: store.query
     }).toMatchSnapshot()
   })
@@ -24,7 +23,7 @@ describe('Store', () => {
   it('detects invalid params', () => {
     const store = Store.create({
       location: {
-        search: 'agentid=foo&datasetid=bar'
+        search: 'dataset=foo/bar'
       }
     })
     expect(store.hasValidParams).toBe(false)
@@ -40,36 +39,12 @@ describe('Store', () => {
     it(`standardizes queryType from ${type} to ${expected}`, () => {
       const store = Store.create({
         location: {
-          search: `agentid=foo&datasetid=bar&query=select&query_type=${type}`
+          search: `dataset=foo/bar&query=select&query_type=${type}`
         }
       })
       expect(store.queryType).toBe(expected)
     })
   })
-  ;[
-    ['agentid=a&datasetid=b', { agentid: 'a', datasetid: 'b' }],
-    ['dataset=a/b', { agentid: 'a', datasetid: 'b' }],
-    ['dataset=a&agentid=b&datasetid=c', { agentid: 'b', datasetid: 'c' }],
-    ['project=a/b', { agentid: 'a', datasetid: 'b' }],
-    ['dataset=c/d&project=a/b', { agentid: 'c', datasetid: 'd' }],
-    [
-      'dataset=c/d&project=a/b&agentid=e&datasetid=f',
-      { agentid: 'c', datasetid: 'd' }
-    ]
-  ].forEach(([search, expected]) => {
-    it(`parsing agentid/datasetid works for ${search}`, () => {
-      const store = Store.create({
-        location: {
-          search
-        }
-      })
-
-      expect({
-        agentid: store.agentid,
-        datasetid: store.datasetid
-      }).toEqual(expected)
-    })
-  })
 })
 
 describe('ChartConfig', () => {
diff --git a/src/util/__test__/__snapshots__/Store.spec.js.snap b/src/util/__test__/__snapshots__/Store.spec.js.snap
index 57eaf17..949d5d2 100644
--- a/src/util/__test__/__snapshots__/Store.spec.js.snap
+++ b/src/util/__test__/__snapshots__/Store.spec.js.snap
@@ -117,8 +117,7 @@ Object {
 
 exports[`Store detects valid params 1`] = `
 Object {
-  "agentid": "foo",
-  "datasetid": "bar",
+  "dataset": "foo/bar",
   "query": "select",
 }
 `;
diff --git a/src/views/App.js b/src/views/App.js
index 440f861..6e4035c 100644
--- a/src/views/App.js
+++ b/src/views/App.js
@@ -65,13 +65,6 @@ class App extends Component<AppP> {
     }
   }
 
-  getQueryUrl() {
-    const { store } = this.props
-    return `${API_HOST}/v0/${store.queryType}/${store.agentid}/${
-      store.datasetid
-    }?includeTableSchema=true`
-  }
-
   getQueryHeaders() {
     const { store } = this.props
     return {
@@ -91,11 +84,28 @@ class App extends Component<AppP> {
       this.data = null
       this.loading = true
     })
-    const res = await fetch(this.getQueryUrl(), {
-      method: 'POST',
-      headers: this.getQueryHeaders(),
-      body: createParams({ query: store.query }).toString()
-    })
+
+    let res
+    if (store.savedQueryId && !store.savedQueryId.includes('sample')) {
+      const savedQueryURL = `${API_HOST}/v0/queries/${
+        store.savedQueryId
+      }/results?includeTableSchema=true`
+
+      res = await fetch(savedQueryURL, {
+        method: 'GET',
+        headers: this.getQueryHeaders()
+      })
+    } else {
+      const unsavedQueryURL = `${API_HOST}/v0/${store.queryType}/${
+        store.dataset
+      }?includeTableSchema=true`
+
+      res = await fetch(unsavedQueryURL, {
+        method: 'POST',
+        headers: this.getQueryHeaders(),
+        body: createParams({ query: store.query }).toString()
+      })
+    }
 
     const loadError = () =>
       runInAction(() => {
@@ -249,7 +259,7 @@ class App extends Component<AppP> {
                   to={{
                     pathname: '/',
                     search:
-                      '?s=N4IgbgpgTgzglgewHYgFwEYA0IA2CDGAhgC6IqqgwSFT4AWaIA-IQOYRKkAmAvAFbI8ATw4wAZFxKEq3HnE7QAthC5wSEALSTihDQHcEUHFzEBHAK7QhPKjgj5iAUgBMABhcBBF64BmUBIrejq5eAGyuMHQICKRIrDD4cMRCMDrEEAB0+DBgLgBikdGx8YnJqeqO4S4AwsEerIrIEEIZla7mMBqlQhrpigAOGlCEcRAwba3h1UlC3gAqEAPeAEoj7BkAHjgwG-kAInA+PtAc+BDe8vOL-eNVIXp0J96FMfIlM+XpWR9p5wDMeza02SVyWblWo02212zjyByOJyQZwuSFBNwmwKEZksUCEAH1kv0IDwAMoARQAMiAAL7YfDIHxwVhoUCkYh2NBIcw4HDYRQ0ADWjAARjQQNhTghVHEYGgANqgPFwLhoVzYRkQYyMT4QPFIQjKcUgegjJCaxgbI2EiCMQjmYgII3C+RoHyEbYQbBsVhQCCsdSc7m8kAAL2gjtQxCglmwCXdNtQuHk1CgRpghmItoSHGlzOwpGUAFUkElAzzYxm8nBNSrUFyebTFcq0FgQBqtYmAFRGk1IM04RhCK1CIm2+2O7DO8huj1e1g+v0BxP08ycI1h-xoKMxkBxjmJnDJsUVqCZxPSM5IXNWuBFktn+vB9Onqs1ss4RsgJW15zq6sdx86ToU1zWXBA8FTfMRwTEA7QdJ0XVQGcqDnBd-XSd9sA3CNt09XciH3JMzWPXcMyzS9r3zW8IGLUs6yDE9iFfACg2pABdPkRnMd0SSJfBMJAPRlWIBh6PLEBHiZOgH1Y6kgA'
+                      '?s=N4IgbgpgTgzglgewHYgFwEYA0IA2CDGAhgC6IqqgwSFT4AWaIA-ACYmFXEC8AVsngE8ISGAFIATADE4SYtAC2EFnBIQAtG2KE1AdwRQcLAGQBHAK7QBXKjgj5iEgAwSAgk4BmUBPKcw6CBFIkAHMYfDhiARgtOQkAYVFHF2D5ZAgBADpRADZHMxg1cMi1OXkABzUoQhCIMVys3LiIgScAFQhypwAlauCIDIAPHBgBiUkAETh3d2hhfAgnGTaOsrrnJJ06Wd9-QJlQoqiY-sPo1VEAZnGcxybI5c7xRx6aweHRqUnp2aR5xaQHqsbhk7gJTBYoAIAPqRMoQLgAZQAigAZEAAX2w+GQ7jgwTQoFIxFsaCQZhwOGw8hoAGtGAAjGggbBzBDKEIwNAAbVAULgLDQjmwuIghkYZzkUKQhEUzJA9GqSFFjAGcthEEYhDMxAQcvpMjQ7kIwwg2EIwWCUAgwVUpPJlJAAC9oLrUMQoBZsGFjRrULgZNQoHKYPpiJqwsJ2fjsKRFABVJARO0Ur2h6SigWoMkUzG8-loLAgEViv0AKjlCqQSpwjAEaoEcM12t12H15CNJrNFqtNrkjGxZlkcudXjQ7s9IG9JL9OADTNTUDDfo48yQUbVcHjiaX2YdIcX6ZLu9zID5mfEwrgGeTDsr1f7CDwQZjDd9IC1Or1BtQHaoXct1q2lm9rYCOrrjqak5ENO-pKvOk6huGq7rjGm4QAmSbASmCEHleR72uiAC6VLVGYxoInC+A3tgOj8sQDBYQ6Wx4nQO4EeiQA'
                   }}
                 >
                   Here's another example (with a preconfigured chart)
@@ -286,7 +296,7 @@ class App extends Component<AppP> {
 
     return (
       <Fragment>
-        <Header agentid={store.agentid} datasetid={store.datasetid} />
+        <Header />
 
         <div className={classes.main}>
           <Sidebar />
@@ -350,14 +360,14 @@ class App extends Component<AppP> {
         {this.saveModalOpen === 'insight' && (
           <SaveAsInsightModal
             onClose={() => (this.saveModalOpen = false)}
-            defaultId={store.agentid + '/' + store.datasetid}
+            defaultId={store.dataset}
             data={this.data}
           />
         )}
         {this.saveModalOpen === 'file' && (
           <SaveAsFileModal
             onClose={() => (this.saveModalOpen = false)}
-            defaultId={store.agentid + '/' + store.datasetid}
+            defaultId={store.dataset}
             data={this.data}
           />
         )}
diff --git a/src/views/StateRestorationGate.js b/src/views/StateRestorationGate.js
index 1672f52..0178c06 100644
--- a/src/views/StateRestorationGate.js
+++ b/src/views/StateRestorationGate.js
@@ -24,8 +24,7 @@ export default class StateRestorationGate extends Component<Props> {
         history.replace({
           pathname: '/',
           search: createParams({
-            agentid: store.agentid,
-            datasetid: store.datasetid,
+            dataset: store.dataset,
             query: store.query
           }).toString()
         })