From 24fd306493d2777eb5fd840763f3da3c26f05461 Mon Sep 17 00:00:00 2001
From: Keita Urashima <ursm@ursm.jp>
Date: Thu, 9 Jan 2020 15:05:32 +0900
Subject: [PATCH] Replace query-string with URL API

---
 client/admin.jsx  |  5 +++--
 package-lock.json | 17 ++---------------
 package.json      |  1 -
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/client/admin.jsx b/client/admin.jsx
index 66837f5..e23afa7 100644
--- a/client/admin.jsx
+++ b/client/admin.jsx
@@ -2,7 +2,6 @@ import React from 'react'
 import ReactDOM from 'react-dom'
 import io from 'socket.io-client';
 import moment from 'moment'
-import queryString from 'query-string';
 
 import 'bootstrap/scss/bootstrap.scss'
 import './app.scss'
@@ -56,7 +55,9 @@ class JobList extends React.Component {
         const cancel = this.props.onCancel.bind(null, job);
         cancelButtonColumn = <td><CancelButton onClick={cancel}/></td>;
       }
-      const redoLink = "../sparql?" + queryString.stringify({query: job.data.rawQuery});
+      const redoLink = new URL('../sparql', location.href);
+      redoLink.searchParams.append('query', job.data.rawQuery);
+
       return (
         <tr key={job.id}>
           <td><JobStateLabel state={job.state} reason={job.data.reason}/></td>
diff --git a/package-lock.json b/package-lock.json
index aad2b8e..b92e511 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4351,7 +4351,8 @@
     "decode-uri-component": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "dev": true
     },
     "decompress-response": {
       "version": "4.2.1",
@@ -10198,15 +10199,6 @@
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
       "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
     },
-    "query-string": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.2.0.tgz",
-      "integrity": "sha512-5wupExkIt8RYL4h/FE+WTg3JHk62e6fFPWtAZA9J5IWK1PfTfKkMS93HBUHcFpeYi9KsY5pFbh+ldvEyaz5MyA==",
-      "requires": {
-        "decode-uri-component": "^0.2.0",
-        "strict-uri-encode": "^2.0.0"
-      }
-    },
     "querystring": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
@@ -11532,11 +11524,6 @@
       "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz",
       "integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo="
     },
-    "strict-uri-encode": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
-      "integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY="
-    },
     "string-length": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz",
diff --git a/package.json b/package.json
index caa193b..0933e17 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,6 @@
     "multer": "^1.3.0",
     "node-fetch": "^2.6.0",
     "node-sass": "^4.12.0",
-    "query-string": "^6.2.0",
     "react": "^16.8.2",
     "react-dom": "^16.8.2",
     "redis": "^2.4.2",