Revert "Streaming exports (compdemocracy#1826)"

This reverts commit 61d2940.
CivicTechTO · Oct 24, 2024 · 08e03eb · 08e03eb
1 parent 61d2940
commit 08e03eb
Show file tree

Hide file tree

Showing 9 changed files with 647 additions and 976 deletions.
diff --git a/client-report/src/components/overview.js b/client-report/src/components/overview.js
@@ -27,9 +27,6 @@ const Number = ({ number, label }) => (
 
 const pathname = window.location.pathname; // "/report/2arcefpshi"
 const report_id = pathname.split("/")[2];
-const doShowDataLicenseTerms = ["pol.is", "preprod.pol.is", "localhost"].includes(
-  window.location.hostname
-);
 
 const getCurrentTimestamp = () => {
   const now = new Date();
@@ -150,16 +147,6 @@ const Overview = ({
           </a>
           {` (as event log)`}
         </p>
-        <p style={{ fontFamily: "monospace" }}>
-          {`---Votes matrix: `}
-          <a
-            download={getDownloadFilename("participant-votes", conversation)}
-            href={`http://${window.location.hostname}/api/v3/reportExport/${report_id}/participant-votes.csv`}
-          >
-            {getDownloadFilename("participant-votes", conversation)}
-          </a>
-          {` (as comments x participants matrix)`}
-        </p>
         <div style={{ marginTop: "3em" }}>
           <p style={{ fontFamily: "monospace" }}>
             <strong>Public API endpoints (read only, Jupyter notebook friendly)</strong>
@@ -173,36 +160,36 @@ const Overview = ({
           <p style={{ fontFamily: "monospace" }}>
             {`$ curl http://${window.location.hostname}/api/v3/reportExport/${report_id}/votes.csv`}
           </p>
-          <p style={{ fontFamily: "monospace" }}>
-            {`$ curl http://${window.location.hostname}/api/v3/reportExport/${report_id}/participant-votes.csv`}
-          </p>
         </div>
-        {doShowDataLicenseTerms && (
-          <div style={{ marginTop: "3em" }}>
-            <p style={{ fontFamily: "monospace" }}>
-              <strong>Attribution of Polis Data</strong>
-            </p>
-
-            <p style={{ fontFamily: "monospace" }}>
-              All Polis data is licensed under a Creative Commons Attribution 4.0 International
-              license: https://creativecommons.org/licenses/by/4.0/
-            </p>
-            <p style={{ fontFamily: "monospace" }}>
-              --------------- BEGIN STATEMENT ---------------
-            </p>
-            <p
-              style={{ fontFamily: "monospace" }}
-            >{`Data was gathered using the Polis software (see: compdemocracy.org/polis and github.com/compdemocracy/polis) and is sub-licensed
+        {window.location.hostname === "pol.is" ||
+          (window.location.hostname === "localhost" && (
+            <div style={{ marginTop: "3em" }}>
+              <p style={{ fontFamily: "monospace" }}>
+                <strong>Attribution of Polis Data</strong>
+              </p>
+
+              <p style={{ fontFamily: "monospace" }}>
+                All Polis data is licensed under a Creative Commons Attribution 4.0 International
+                license: https://creativecommons.org/licenses/by/4.0/
+              </p>
+              <p style={{ fontFamily: "monospace" }}>
+                --------------- BEGIN STATEMENT ---------------
+              </p>
+              <p
+                style={{ fontFamily: "monospace" }}
+              >{`Data was gathered using the Polis software (see: compdemocracy.org/polis and github.com/compdemocracy/polis) and is sub-licensed
           under CC BY 4.0 with Attribution to The Computational Democracy Project. The data and more
           information about how the data was collected can be found at the following link: ${window.location.href}`}</p>
-            <p style={{ fontFamily: "monospace" }}>--------------- END STATEMENT---------------</p>
-            <p style={{ fontFamily: "monospace" }}>
-              For further information on best practices for Attribution of CC 4.0 licensed content
-              Please see:
-              https://wiki.creativecommons.org/wiki/Best_practices_for_attribution#Title.2C_Author.2C_Source.2C_License
-            </p>
-          </div>
-        )}
+              <p style={{ fontFamily: "monospace" }}>
+                --------------- END STATEMENT---------------
+              </p>
+              <p style={{ fontFamily: "monospace" }}>
+                For further information on best practices for Attribution of CC 4.0 licensed content
+                Please see:
+                https://wiki.creativecommons.org/wiki/Best_practices_for_attribution#Title.2C_Author.2C_Source.2C_License
+              </p>
+            </div>
+          ))}
       </div>
     </div>
   );

diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/server/package.json b/server/package.json
@@ -51,7 +51,7 @@
     "p3p": "~0.0.2",
     "pg": "~8.8.0",
     "pg-connection-string": "~2.5.0",
-    "pg-query-stream": "^4.6.0",
+    "pg-native": "~3.0.1",
     "replacestream": "~4.0.0",
     "request": "~2.88.2",
     "request-promise": "~4.2.6",