Merge pull request #19 from icefoganalytics/main

Updates from IceFog

api/src/controllers/datasets/index.ts

@@ -1,4 +1,3 @@
-export { DownloadController } from "./download-controller"
 export { EmailSubscribersController } from "./email-subscribers-controller"
 export { FilesController } from "./files-controller"
 export { RefreshController } from "./refresh-controller"

api/src/controllers/datasets/download-controller.ts → api/src/controllers/download/datasets-controller.ts

@@ -3,11 +3,11 @@ import { format } from "fast-csv"
 
 import { Dataset } from "@/models"
 import { DatasetsPolicy } from "@/policies"
-import { CreateService } from "@/services/datasets/download"
+import { CreateService } from "@/services/download/datasets"
 
 import { BaseController } from "@/controllers/base-controller"
 
-export class DownloadController extends BaseController {
+export class DatasetsController extends BaseController {
   async create() {
     const dataset = await this.loadDataset()
     if (isNil(dataset)) {
@@ -72,4 +72,4 @@ export class DownloadController extends BaseController {
   }
 }
 
-export default DownloadController
+export default DatasetsController

api/src/controllers/download/index.ts

@@ -0,0 +1 @@
+export { DatasetsController } from "./datasets-controller"

api/src/controllers/index.ts

@@ -15,6 +15,7 @@ export { VisualizationControlsController } from "./visualization-controls-contro
 
 export * as AccessRequests from "./access-requests"
 export * as Datasets from "./datasets"
+export * as Download from "./download"
 export * as Users from "./users"
 export * as UserGroups from "./user-groups"
 export * as QaScenarios from "./qa-scenarios"

api/src/router.ts

@@ -31,6 +31,7 @@ import {
   Datasets,
   DatasetsController,
   DatasetStewardshipsController,
+  Download,
   QaScenarios,
   TaggingsController,
   TagsController,
@@ -54,7 +55,7 @@ router.route("/_status").get((req: Request, res: Response) => {
 
 // Authenticated routes
 router.use(
-  "/",
+  /\/(api|download)/,
   bodyAuthorizationHoistMiddleware,
   temporaryAccessCookieHoistMiddleware,
   jwtMiddleware,
@@ -63,7 +64,7 @@ router.use(
 )
 
 // Non-API routes
-router.route("/datasets/:datasetIdOrSlug/download").post(Datasets.DownloadController.create)
+router.route("/download/datasets/:datasetIdOrSlug").post(Download.DatasetsController.create)
 
 // API routes
 // Add all the standard api controller routes here

api/src/services/datasets/index.ts

@@ -1,6 +1,5 @@
 export { CreateService } from "./create-service"
 export { UpdateService } from "./update-service"
 
-export * as Download from "./download"
 export * as Files from "./files"
 export * as Refresh from "./refresh"

api/src/services/datasets/download/create-service.ts → api/src/services/download/datasets/create-service.ts

@@ -2,8 +2,8 @@ import { CsvFormatterStream } from "fast-csv"
 import { isEmpty, isUndefined } from "lodash"
 
 import { Dataset, User } from "@/models"
-import CreateFromIntegrationService from "@/services/datasets/download/create-from-integration-service"
-import CreateFromFileService from "@/services/datasets/download/create-from-file-service"
+import CreateFromIntegrationService from "@/services/download/datasets/create-from-integration-service"
+import CreateFromFileService from "@/services/download/datasets/create-from-file-service"
 
 import BaseService from "@/services/base-service"
 

api/src/services/download/datasets/index.ts

@@ -0,0 +1 @@
+export { CreateService } from "./create-service"

api/src/services/download/index.ts

@@ -0,0 +1 @@
+export * as Datasets from "./datasets"

api/src/services/index.ts

@@ -5,6 +5,7 @@ export * as DatasetFields from "./dataset-fields"
 export * as DatasetIntegrations from "./dataset-integrations"
 export * as Datasets from "./datasets"
 export * as DatasetStewardships from "./dataset-stewardships"
+export * as Download from "./download"
 export * as Taggings from "./taggings"
 export * as UserGroups from "./user-groups"
 export * as Users from "./users"

web/src/components/dataset-entries/DownloadAsCsvButton.vue

@@ -47,7 +47,7 @@ const accessToken = ref<string | null>(null)
 
 const downloadUrl = computed(() => {
   const serializedParams = stringifyQuery(props.query)
-  return `${API_BASE_URL}/datasets/${props.datasetId}/download.csv?${serializedParams}`
+  return `${API_BASE_URL}/download/datasets/${props.datasetId}.csv?${serializedParams}`
 })
 
 async function getAccessTokenAndSubmit() {