Athena refactor (#2975)

* reduce callback hell of components inside State and then inside Athena * reduce dependencies of components each from the other, or at least make them more predictable Co-authored-by: Alexei Mochalov <[email protected]>
quiltdata · Aug 12, 2022 · 9c1d054 · 9c1d054
1 parent 8f59d6e
commit 9c1d054
Show file tree

Hide file tree

Showing 14 changed files with 697 additions and 749 deletions.
diff --git a/catalog/app/constants/routes.js b/catalog/app/constants/routes.js
@@ -150,14 +150,20 @@ export const bucketESQueries = {
   url: (bucket) => `/b/${bucket}/queries/es`,
 }
 
-export const bucketAthenaQueries = {
+export const bucketAthena = {
   path: '/b/:bucket/queries/athena',
   url: (bucket) => `/b/${bucket}/queries/athena`,
 }
 
-export const bucketAthenaQueryExecution = {
-  path: '/b/:bucket/queries/athena/:queryExecutionId',
-  url: (bucket, queryExecutionId) => `/b/${bucket}/queries/athena/${queryExecutionId}`,
+export const bucketAthenaWorkgroup = {
+  path: '/b/:bucket/queries/athena/:workgroup',
+  url: (bucket, workgroup) => `/b/${bucket}/queries/athena/${workgroup}`,
+}
+
+export const bucketAthenaExecution = {
+  path: '/b/:bucket/queries/athena/:workgroup/:queryExecutionId',
+  url: (bucket, workgroup, queryExecutionId) =>
+    `/b/${bucket}/queries/athena/${workgroup}/${queryExecutionId}`,
 }
 
 // legacy stuff