avvir 7.1.5 → 7.1.7

package/source/api/integrations_api.ts

@@ -1,151 +1,190 @@
-import {
-    ApiIntegrationCredentials,
-    ApiIntegrationCredentialsType,
-    ApiIntegrationProject,
-    ApiRunningProcess,
-    AssociationIds,
-    User
-} from "../models";
 import Http from "../utilities/http";
 import makeErrorsPretty from "../utilities/make_errors_pretty";
-import {ApiObservationRequest} from "../models/api/integrations/procore/api_observation_request";
 
-export default class IntegrationsApi {
-
-    static getIntegrationCredentials({
-                                         organizationId,
-                                         projectId
-                                     }: AssociationIds, credentialType: ApiIntegrationCredentialsType, user: User): Promise<ApiIntegrationCredentials> {
-        const url = `${Http.baseUrl()}/integrations/organizations/${organizationId}/projects/${projectId}/credentials/${credentialType}`;
-        return Http.get(url, user) as unknown as Promise<ApiIntegrationCredentials>;
-    }
+import type ApiAutodeskAccessToken from "../models/api/integrations/autodesk/api_access_token";
+import type ApiHubs from "../models/api/integrations/autodesk/api_hubs";
+import type ApiProjects from "../models/api/integrations/autodesk/api_projects";
+import type { ApiIntegrationCredentials, ApiIntegrationCredentialsType, ApiIntegrationProject, ApiObservationRequest, ApiRunningProcess, User } from "../models";
+import type { AssociationIds } from "type_aliases";
 
-    static getIntegrationProjectsForCredentials({
-                                                    organizationId,
-                                                    projectId
-                                                }: AssociationIds, credentialType: ApiIntegrationCredentialsType, user: User): Promise<ApiIntegrationProject[]> {
-        const url = `${Http.baseUrl()}/integrations/organizations/${organizationId}/projects/${projectId}/credentials/${credentialType}/projects`;
-        return Http.get(url, user) as unknown as Promise<ApiIntegrationProject[]>;
-    }
+export default class IntegrationsApi {
 
-    static getProjectIntegrationCredentials({
+  static getIntegrationCredentials({
+                                     organizationId,
+                                     projectId
+                                   }: AssociationIds,
+                                   credentialType: ApiIntegrationCredentialsType,
+                                   user: User): Promise<ApiIntegrationCredentials> {
+    const url = `${Http.baseUrl()}/integrations/organizations/${organizationId}/projects/${projectId}/credentials/${credentialType}`;
+    return Http.get(url, user) as unknown as Promise<ApiIntegrationCredentials>;
+  }
+
+  static getIntegrationProjectsForCredentials({
                                                 organizationId,
                                                 projectId
-                                            }: AssociationIds, user: User): Promise<ApiIntegrationCredentials[]> {
-        const url = `${Http.baseUrl()}/integrations/organizations/${organizationId}/projects/${projectId}/credentials`;
-        return Http.get(url, user) as unknown as Promise<ApiIntegrationCredentials[]>;
+                                              }: AssociationIds,
+                                              credentialType: ApiIntegrationCredentialsType,
+                                              user: User): Promise<ApiIntegrationProject[]> {
+    const url = `${Http.baseUrl()}/integrations/organizations/${organizationId}/projects/${projectId}/credentials/${credentialType}/projects`;
+    return Http.get(url, user) as unknown as Promise<ApiIntegrationProject[]>;
+  }
+
+  static getProjectIntegrationCredentials({
+                                            organizationId,
+                                            projectId
+                                          }: AssociationIds, user: User): Promise<ApiIntegrationCredentials[]> {
+    const url = `${Http.baseUrl()}/integrations/organizations/${organizationId}/projects/${projectId}/credentials`;
+    return Http.get(url, user) as unknown as Promise<ApiIntegrationCredentials[]>;
+  }
+
+  static saveIntegrationCredentials({
+                                      organizationId,
+                                      projectId
+                                    }: AssociationIds,
+                                    credentials: ApiIntegrationCredentials,
+                                    user: User): Promise<ApiIntegrationCredentials> {
+    const url = `${Http.baseUrl()}/integrations/organizations/${organizationId}/projects/${projectId}/credentials/${credentials.credentialsType}`;
+    return Http.put(url, user, credentials) as unknown as Promise<ApiIntegrationCredentials>;
+  }
+
+  static syncIntegrationProjects({
+                                   organizationId,
+                                   projectId
+                                 }: AssociationIds,
+                                 credentialsType: ApiIntegrationCredentialsType,
+                                 user: User): Promise<ApiRunningProcess> {
+    const url = `${Http.baseUrl()}/integrations/organizations/${organizationId}/projects/${projectId}/credentials/${credentialsType}/sync-projects`;
+    return Http.post(url, user) as unknown as Promise<ApiRunningProcess>;
+  }
+
+  static syncIntegrationPhotoAreas({
+                                     organizationId,
+                                     projectId
+                                   }: AssociationIds,
+                                   credentialsType: ApiIntegrationCredentialsType,
+                                   user: User): Promise<ApiRunningProcess> {
+    const url = `${Http.baseUrl()}/integrations/organizations/${organizationId}/projects/${projectId}/credentials/${credentialsType}/sync-photo-areas`;
+    return Http.post(url, user) as unknown as Promise<ApiRunningProcess>;
+  }
+
+  static updateProjectIntegrationProject({
+                                           organizationId,
+                                           projectId
+                                         }: AssociationIds,
+                                         integrationProject: ApiIntegrationProject | null,
+                                         user: User): Promise<void> {
+    const url = `${Http.baseUrl()}/integrations/organizations/${organizationId}/projects/${projectId}/set-integration-project`;
+    return Http.post(url, user, integrationProject) as unknown as Promise<void>;
+  }
+
+  static checkProcoreAccessToken(procoreAccessToken: string,
+                                 user: User): Promise<{ expiresInSeconds: number }> {
+    if (!procoreAccessToken) {
+      return Promise.reject(new Error("Procore access token not found"));
     }
-
-    static saveIntegrationCredentials({
-                                          organizationId,
-                                          projectId
-                                      }: AssociationIds, credentials: ApiIntegrationCredentials, user: User): Promise<ApiIntegrationCredentials> {
-        const url = `${Http.baseUrl()}/integrations/organizations/${organizationId}/projects/${projectId}/credentials/${credentials.credentialsType}`;
-        return Http.put(url, user, credentials) as unknown as Promise<ApiIntegrationCredentials>;
+    let url = `${Http.baseUrl()}/integrations/procore/access-token?procore-access-token=${procoreAccessToken}`;
+    return Http.get(url, user) as unknown as Promise<{ expiresInSeconds: number }>;
+  }
+
+  static pushPdfToProcore({
+                            projectId,
+                            floorId,
+                            scanDatasetId
+                          }: AssociationIds,
+                          procoreProjectId: string,
+                          procoreCompanyId: string,
+                          procoreAccessToken: string,
+                          pdfType: string,
+                          user: User): Promise<{
+    id: number
+  }>
+  {
+    if (!projectId) {
+      return Promise.reject(new Error("Project not loaded yet"));
     }
-
-    static syncIntegrationProjects({
-                                       organizationId,
-                                       projectId
-                                   }: AssociationIds, credentialsType: ApiIntegrationCredentialsType, user: User): Promise<ApiRunningProcess> {
-        const url = `${Http.baseUrl()}/integrations/organizations/${organizationId}/projects/${projectId}/credentials/${credentialsType}/sync-projects`;
-        return Http.post(url, user) as unknown as Promise<ApiRunningProcess>;
+    const url = `${Http.baseUrl()}/projects/${projectId}/push-report-to-procore/${pdfType}?procore-project-id=${procoreProjectId}&procore-company-id=${procoreCompanyId}&procore-access-token=${procoreAccessToken}`;
+    return Http.post(url, user, null) as unknown as Promise<{ id: number }>;
+  }
+
+  static getProcoreProjects(procoreAccessToken: string,
+                            companyId: string,
+                            user: User): Promise<{ lastUpdated: number, projectId: string | number }[]> {
+    if (!procoreAccessToken) {
+      return Promise.reject(new Error("Procore access token not found"));
     }
-
-    static syncIntegrationPhotoAreas({
-                                         organizationId,
-                                         projectId
-                                     }: AssociationIds, credentialsType: ApiIntegrationCredentialsType, user: User): Promise<ApiRunningProcess> {
-        const url = `${Http.baseUrl()}/integrations/organizations/${organizationId}/projects/${projectId}/credentials/${credentialsType}/sync-photo-areas`;
-        return Http.post(url, user) as unknown as Promise<ApiRunningProcess>;
+    let url = `${Http.baseUrl()}/integrations/procore/projects`;
+    const params = [];
+    params.push(`procore-access-token=${procoreAccessToken}`);
+    if (companyId) {
+      params.push(`companyId=${companyId}`);
     }
-
-    static updateProjectIntegrationProject({
-                                               organizationId,
-                                               projectId
-                                           }: AssociationIds, integrationProject: ApiIntegrationProject | null, user: User): Promise<void> {
-        const url = `${Http.baseUrl()}/integrations/organizations/${organizationId}/projects/${projectId}/set-integration-project`;
-        return Http.post(url, user, integrationProject) as unknown as Promise<void>;
+    url += "?" + params.join("&");
+    return Http.get(url, user) as unknown as Promise<{ lastUpdated: number, projectId: string | number }[]>;
+  }
+
+  static getProcoreCompanies(procoreAccessToken: string,
+                             user: User): Promise<{ name: string, id: string | number }[]> {
+    if (!procoreAccessToken) {
+      return Promise.reject(new Error("Procore access token not found"));
     }
-
-    static checkProcoreAccessToken(procoreAccessToken: string,
-                                   user: User): Promise<{ expiresInSeconds: number }> {
-        if (!procoreAccessToken) {
-            return Promise.reject(new Error("Procore access token not found"));
-        }
-        let url = `${Http.baseUrl()}/integrations/procore/access-token?procore-access-token=${procoreAccessToken}`;
-        return Http.get(url, user) as unknown as Promise<{ expiresInSeconds: number }>;
+    let url = `${Http.baseUrl()}/integrations/procore/companies?procore-access-token=${procoreAccessToken}`;
+    return Http.get(url, user) as unknown as Promise<{ name: string, id: string | number }[]>;
+  }
+
+  static listProcoreObservationTypes(procoreAccessToken: string,
+                                     companyId: string,
+                                     user: User): Promise<{ name: string, id: string | number, category: string }[]> {
+    if (!procoreAccessToken) {
+      return Promise.reject(new Error("Procore access token not found"));
     }
-
-    static pushPdfToProcore({
-                                projectId,
-                                floorId,
-                                scanDatasetId
-                            }: AssociationIds, procoreProjectId: string, procoreCompanyId: string, procoreAccessToken: string, pdfType: string, user: User): Promise<{
-        id: number
-    }> {
-        if (!projectId) {
-            return Promise.reject(new Error("Project not loaded yet"));
-        }
-        const url = `${Http.baseUrl()}/projects/${projectId}/push-report-to-procore/${pdfType}?procore-project-id=${procoreProjectId}&procore-company-id=${procoreCompanyId}&procore-access-token=${procoreAccessToken}`;
-        return Http.post(url, user, null) as unknown as Promise<{ id: number }>;
+    if (!companyId) {
+      return Promise.reject(new Error("company id not found"));
     }
-
-    static getProcoreProjects(procoreAccessToken: string,
-                              companyId: string,
-                              user: User): Promise<{ lastUpdated: number, projectId: string | number }[]> {
-        if (!procoreAccessToken) {
-            return Promise.reject(new Error("Procore access token not found"));
-        }
-        let url = `${Http.baseUrl()}/integrations/procore/projects`;
-        const params = [];
-        params.push(`procore-access-token=${procoreAccessToken}`)
-        if (companyId) {
-            params.push(`companyId=${companyId}`)
-        }
-        url += "?" + params.join("&");
-        return Http.get(url, user) as unknown as Promise<{ lastUpdated: number, projectId: string | number }[]>;
+    let url = `${Http.baseUrl()}/integrations/procore/${companyId}/observation-types?procore-access-token=${procoreAccessToken}`;
+    return Http.get(url, user) as unknown as Promise<{ name: string, id: string | number, category: string }[]>;
+  }
+
+  static CreateProcoreObservation(procoreAccessToken: string,
+                                  companyId: string,
+                                  projectId: string,
+                                  observationRequest: ApiObservationRequest,
+                                  user: User): Promise<void> {
+    if (!procoreAccessToken) {
+      return Promise.reject(new Error("Procore access token not found"));
+    }
+    if (!projectId) {
+      return Promise.reject(new Error("project id not found"));
+    }
+    if (!companyId) {
+      return Promise.reject(new Error("company id not found"));
     }
+    let url = `${Http.baseUrl()}/integrations/procore/${companyId}/${projectId}/create-observation?procore-access-token=${procoreAccessToken}`;
+    return Http.post(url, user, observationRequest) as unknown as Promise<void>;
+  }
 
-    static getProcoreCompanies(procoreAccessToken: string,
-                               user: User): Promise<{ name: string, id: string | number }[]> {
-        if (!procoreAccessToken) {
-            return Promise.reject(new Error("Procore access token not found"));
-        }
-        let url = `${Http.baseUrl()}/integrations/procore/companies?procore-access-token=${procoreAccessToken}`;
-        return Http.get(url, user) as unknown as Promise<{ name: string, id: string | number }[]>;
+  static getAutodeskAccessToken(code: string, redirectUri: string, user: User): Promise<ApiAutodeskAccessToken> {
+    if (!code || !redirectUri) {
+      return Promise.reject(new Error("Invalid client secret or redirectUri"));
     }
+    const url = `${Http.baseUrl()}/integrations/autodesk/access-token?code=${code}&redirect-uri=${redirectUri}`;
+    return Http.get(url, user) as unknown as Promise<ApiAutodeskAccessToken>;
+  }
 
-    static listProcoreObservationTypes(procoreAccessToken: string,
-                                       companyId: string,
-                                       user: User): Promise<{ name: string, id: string | number, category: string }[]> {
-        if (!procoreAccessToken) {
-            return Promise.reject(new Error("Procore access token not found"));
-        }
-        if (!companyId) {
-            return Promise.reject(new Error("company id not found"));
-        }
-        let url = `${Http.baseUrl()}/integrations/procore/${companyId}/observation-types?procore-access-token=${procoreAccessToken}`;
-        return Http.get(url, user) as unknown as Promise<{ name: string, id: string | number, category: string }[]>;
+  static getAutodeskHubs(access_token: string, user: User): Promise<ApiHubs> {
+    if (!access_token) {
+      return Promise.reject(new Error("Invalid access token"));
     }
+    const url = `${Http.baseUrl()}/integrations/autodesk/hubs?access-token=${access_token}`;
+    return Http.get(url, user) as unknown as Promise<ApiHubs>;
+  }
 
-    static CreateProcoreObservation(procoreAccessToken: string,
-                                    companyId: string,
-                                    projectId: string,
-                                    observationRequest: ApiObservationRequest,
-                                    user: User): Promise<void> {
-        if (!procoreAccessToken) {
-            return Promise.reject(new Error("Procore access token not found"));
-        }
-        if (!projectId) {
-            return Promise.reject(new Error("project id not found"));
-        }
-        if (!companyId) {
-            return Promise.reject(new Error("company id not found"));
-        }
-        let url = `${Http.baseUrl()}/integrations/procore/${companyId}/${projectId}/create-observation?procore-access-token=${procoreAccessToken}`;
-        return Http.post(url, user, observationRequest) as unknown as Promise<void>;
+  static getAutodeskProjects(access_token: string, hubId: string, user: User): Promise<ApiProjects> {
+    if (!access_token || !hubId) {
+      return Promise.reject(new Error("Invalid access token or hubId"));
     }
+    const url = `${Http.baseUrl()}/integrations/autodesk/projects?access-token=${access_token}&hubId=${hubId}`;
+    return Http.get(url, user) as unknown as Promise<ApiProjects>;
+  }
 
 }
 

package/source/api/photo_area_api.ts

@@ -1,8 +1,10 @@
 import { isArray } from "underscore";
-import { ApiPhotoArea, ApiPhotoLocation, ApiPhotoLocation3d, ApiPhotoSession, AssociationIds } from "../models";
-import { User } from "../utilities/get_authorization_headers";
-import makeErrorsPretty from "../utilities/make_errors_pretty";
+
 import Http from "../utilities/http";
+import makeErrorsPretty from "../utilities/make_errors_pretty";
+
+import type { ApiPhotoArea, ApiPhotoLocation, ApiPhotoLocation3d, ApiPhotoSession, User } from "../models";
+import type { AssociationIds } from "type_aliases";
 
 export default class PhotoAreaApi {
 

package/source/api/pipeline_api.ts

@@ -1,8 +1,8 @@
-import { AssociationIds } from "../models";
 import Http from "../utilities/http";
 import makeErrorsPretty from "../utilities/make_errors_pretty";
-import { User } from "../utilities/get_authorization_headers";
-import ApiPipeline, { ApiPipelineArgument } from "../models/api/api_pipeline";
+
+import type { ApiPipeline, ApiPipelineArgument, User } from "../models";
+import type { AssociationIds } from "type_aliases";
 
 export default class PipelineApi {
   static triggerPipeline(body: ApiPipelineArgument = {}, user: User): Promise<ApiPipeline> {
@@ -10,16 +10,16 @@ export default class PipelineApi {
     return Http.post(url, user, body) as unknown as Promise<ApiPipeline>;
   }
 
-  static checkPipelineStatus({projectId}: AssociationIds, pipelineId: number, user: User): Promise<ApiPipeline> {
+  static checkPipelineStatus({ projectId }: AssociationIds, pipelineId: number, user: User): Promise<ApiPipeline> {
     const url = `${Http.baseUrl()}/pipelines/${pipelineId}`;
     return Http.get(url, user) as unknown as Promise<ApiPipeline>;
   }
 
-  static getFloorPipelines({projectId, floorId}: AssociationIds, user: User): Promise<ApiPipeline[]> {
+  static getFloorPipelines({ projectId, floorId }: AssociationIds, user: User): Promise<ApiPipeline[]> {
     const url = `${Http.baseUrl()}/projects/${projectId}/floors/${floorId}/pipelines`;
     console.log(url);
     return Http.get(url, user) as unknown as Promise<ApiPipeline[]>;
   }
 }
 
-makeErrorsPretty(PipelineApi)
+makeErrorsPretty(PipelineApi);

package/source/api/project_api.ts

@@ -1,11 +1,11 @@
-import getAuthorizationHeaders, { User } from "../utilities/get_authorization_headers";
+import getAuthorizationHeaders from "../utilities/get_authorization_headers";
 import Http from "../utilities/http";
 import makeErrorsPretty from "../utilities/make_errors_pretty";
 import { DateConverter } from "../converters";
+import { PbeTsvType } from "../models/api/pbe_tsv_type";
 
-import type { ApiClassificationCode, ApiCloudFile, ApiMasterformatProgress, ApiProject, ApiProjectCostAnalysisProgress, ApiProjectCostAnalysisProgressValidationResult, ApiProjectListing, ApiProjectWorkPackage, ApiProjectWorkPackageCost, ApiRunningProcess, AssociationIds, ProgressType, ProjectWorkPackageType } from "../models";
-import type { DateLike } from "type_aliases";
-import {PbeTsvType} from "../models/api/PbeTsvType";
+import type { ApiClassificationCode, ApiCloudFile, ApiMasterformatProgress, ApiProject, ApiProjectCostAnalysisProgress, ApiProjectCostAnalysisProgressValidationResult, ApiProjectListing, ApiProjectWorkPackage, ApiProjectWorkPackageCost, ApiRunningProcess, ProgressType, ProjectWorkPackageType, User } from "../models";
+import type { AssociationIds, DateLike } from "type_aliases";
 
 export default class ProjectApi {
   static listProjectsForOrganization(organizationId: string, user: User): Promise<ApiProject[]> {
@@ -155,34 +155,36 @@ export default class ProjectApi {
   static generateMasterformatProgress({ projectId }: AssociationIds,
                                       reportDate: DateLike,
                                       masterformatVersion: number,
-                                      user: User) {
+                                      user: User)
+  {
     const formattedDate = DateConverter.dateToISO(reportDate);
     const url = `${Http.baseUrl()}/projects/${projectId}/masterformat-progress-report?masterformatVersion=${masterformatVersion}&reportDate=${formattedDate}`;
     return Http.post(url, user) as unknown as Promise<ApiRunningProcess>;
   }
 
-  static getFiltered5dTsv({projectId}: AssociationIds, projectName: string, fileName: string, filter, user:User) {
+  static getFiltered5dTsv({ projectId }: AssociationIds, projectName: string, fileName: string, filter, user: User) {
     const url = `${Http.baseUrl()}/projects/${projectId}/cost-analysis-progress/line-items/${fileName}`;
     return Http.put(url, user, filter, "application/json", "text/tab-separated-values") as unknown as Promise<string>;
   }
 
-  static getClassificationCodes({projectId}: AssociationIds, user:User) {
+  static getClassificationCodes({ projectId }: AssociationIds, user: User) {
     const url = `${Http.baseUrl()}/projects/${projectId}/classification-codes`;
     return Http.get(url, user) as unknown as Promise<ApiClassificationCode[]>;
   }
-  static checkWbsStatus({projectId}: AssociationIds, user: User) {
-    const url = `${Http.baseUrl()}/projects/${projectId}/cost-analysis-progress/validations`
-    return Http.get(url, user) as unknown as Promise<ApiProjectCostAnalysisProgressValidationResult>
+
+  static checkWbsStatus({ projectId }: AssociationIds, user: User) {
+    const url = `${Http.baseUrl()}/projects/${projectId}/cost-analysis-progress/validations`;
+    return Http.get(url, user) as unknown as Promise<ApiProjectCostAnalysisProgressValidationResult>;
   };
 
-  static updateMasterformatSelection({projectId, floorId}: AssociationIds, masterformatTree, user: User) {
+  static updateMasterformatSelection({ projectId, floorId }: AssociationIds, masterformatTree, user: User) {
     const url = `${Http.baseUrl()}/projects/${projectId}/floors/${floorId}/cost-analysis-progress-modeled-total-cost`;
     return Http.put(url, user, masterformatTree) as unknown as Promise<ApiProjectCostAnalysisProgress[]>;
   }
 
-  static getWorkPackageCosts({projectId}: AssociationIds, workPackageType: ProjectWorkPackageType, user: User) {
+  static getWorkPackageCosts({ projectId }: AssociationIds, workPackageType: ProjectWorkPackageType, user: User) {
     const url = `${Http.baseUrl()}/projects/${projectId}/work-packages/${workPackageType}/costs`;
-    return Http.get(url, user) as unknown as Promise<ApiProjectWorkPackageCost[]>
+    return Http.get(url, user) as unknown as Promise<ApiProjectWorkPackageCost[]>;
   }
 
   static generateAllMasterformatProgress({ projectId }: AssociationIds,
@@ -194,7 +196,7 @@ export default class ProjectApi {
     return Http.post(url, user) as unknown as Promise<ApiRunningProcess>;
   }
 
-  static updateProjectExportTsv({ projectId }: AssociationIds, tsvContent: string, user: User, dispatch) {
+  static updateProjectExportTsv({ projectId }: AssociationIds, tsvContent: string, user: User) {
     let multipartFormData = new FormData();
     let file = new Blob([tsvContent], { type: "text/tab-separated-values" });
     multipartFormData.append("file", file, "file.tsv");
@@ -212,4 +214,8 @@ export default class ProjectApi {
   }
 }
 
-makeErrorsPretty(ProjectApi, { exclude: ["getProjectDeviationsReportTsvUrl", "getTradeBreakdownTsvUrl"], overrideErrorMessage:["getFiltered5dTsv", "saveTradeBreakdownTsv"] });
+makeErrorsPretty(ProjectApi,
+  {
+    exclude: ["getProjectDeviationsReportTsvUrl", "getTradeBreakdownTsvUrl"],
+    overrideErrorMessage: ["getFiltered5dTsv", "saveTradeBreakdownTsv"]
+  });

package/source/api/recipe_api.ts

@@ -1,8 +1,8 @@
-import { User } from "../utilities/get_authorization_headers";
 import Http from "../utilities/http";
-import { AssociationIds } from "../models";
 import makeErrorsPretty from "../utilities/make_errors_pretty";
-import ApiRecipe from "../models/api/api_recipe";
+
+import type { ApiRecipe, User } from "../models";
+import type { AssociationIds } from "type_aliases";
 
 export default class RecipeApi {
   static getGlobalRecipe({ recipeId }: AssociationIds, user: User, ): Promise<ApiRecipe|null> {

package/source/api/report_api.ts

@@ -1,42 +1,57 @@
-import makeErrorsPretty from "../utilities/make_errors_pretty";
-import {AssociationIds} from "../models";
-import {User} from "../utilities/get_authorization_headers";
 import Http from "../utilities/http";
-import {ApiInspectReport, ApiInspectReportEntry} from "../models";
+import makeErrorsPretty from "../utilities/make_errors_pretty";
+
+import type { ApiInspectReport, ApiInspectReportEntry, User } from "../models";
+import type { AssociationIds } from "type_aliases";
 
 export default class ReportApi {
-    static createInspectReport({ projectId }: AssociationIds, report: ApiInspectReport, user: User): Promise<ApiInspectReport> {
-        let url = `${Http.baseUrl()}/projects/${projectId}/reports`;
-        return Http.post(url, user, report) as unknown as Promise<ApiInspectReport>;
-    }
-    static listInspectReports({projectId}: AssociationIds, user: User): Promise<ApiInspectReport[]> {
-        let url = `${Http.baseUrl()}/projects/${projectId}/reports`;
-        return Http.get(url, user) as unknown as Promise<ApiInspectReport[]>;
-    }
-    static listInspectReportEntries({projectId, inspectReportId}: AssociationIds, user: User): Promise<ApiInspectReportEntry[]> {
-        let url = `${Http.baseUrl()}/projects/${projectId}/reports/${inspectReportId}/inspect-entries`;
-        return Http.get(url, user) as unknown as Promise<ApiInspectReportEntry[]>;
-    }
-    static createInspectReportEntries({ projectId, inspectReportId }: AssociationIds, reportEntries: ApiInspectReportEntry[], user: User): Promise<ApiInspectReportEntry[]> {
-        let url = `${Http.baseUrl()}/projects/${projectId}/reports/${inspectReportId}/inspect-entries`;
-        return Http.post(url, user, reportEntries) as unknown as Promise<ApiInspectReportEntry[]>;
-    }
-    static updateInspectReportEntry({ projectId, inspectReportId, inspectReportEntryId }: AssociationIds, reportEntry, user): Promise<ApiInspectReportEntry> {
-        let url = `${Http.baseUrl()}/projects/${projectId}/reports/${inspectReportId}/inspect-entries/${inspectReportEntryId}`;
-        return Http.put(url, user, reportEntry) as unknown as Promise<ApiInspectReportEntry>;
-    }
-    static updateInspectReport({ projectId, inspectReportId }: AssociationIds, report, user): Promise<ApiInspectReport> {
-        let url = `${Http.baseUrl()}/projects/${projectId}/reports/${inspectReportId}`;
-        return Http.put(url, user, report) as unknown as Promise<ApiInspectReport>;
-    }
-    static deleteInspectReport({ projectId, inspectReportId }: AssociationIds, user): Promise<void> {
-        let url = `${Http.baseUrl()}/projects/${projectId}/reports/${inspectReportId}`;
-        return Http.delete(url, user) as unknown as Promise<void>;
-    }
-    static deleteInspectReportEntry({ projectId, inspectReportId, inspectReportEntryId}: AssociationIds, user: User): Promise<void> {
-        let url = `${Http.baseUrl()}/projects/${projectId}/reports/${inspectReportId}/inspect-entries/${inspectReportEntryId}`;
-        return Http.delete(url, user) as unknown as Promise<void>;
-    }
+  static createInspectReport({ projectId }: AssociationIds,
+                             report: ApiInspectReport,
+                             user: User): Promise<ApiInspectReport> {
+    let url = `${Http.baseUrl()}/projects/${projectId}/reports`;
+    return Http.post(url, user, report) as unknown as Promise<ApiInspectReport>;
+  }
+
+  static listInspectReports({ projectId }: AssociationIds, user: User): Promise<ApiInspectReport[]> {
+    let url = `${Http.baseUrl()}/projects/${projectId}/reports`;
+    return Http.get(url, user) as unknown as Promise<ApiInspectReport[]>;
+  }
+
+  static listInspectReportEntries({ projectId, inspectReportId }: AssociationIds,
+                                  user: User): Promise<ApiInspectReportEntry[]> {
+    let url = `${Http.baseUrl()}/projects/${projectId}/reports/${inspectReportId}/inspect-entries`;
+    return Http.get(url, user) as unknown as Promise<ApiInspectReportEntry[]>;
+  }
+
+  static createInspectReportEntries({ projectId, inspectReportId }: AssociationIds,
+                                    reportEntries: ApiInspectReportEntry[],
+                                    user: User): Promise<ApiInspectReportEntry[]> {
+    let url = `${Http.baseUrl()}/projects/${projectId}/reports/${inspectReportId}/inspect-entries`;
+    return Http.post(url, user, reportEntries) as unknown as Promise<ApiInspectReportEntry[]>;
+  }
+
+  static updateInspectReportEntry({ projectId, inspectReportId, inspectReportEntryId }: AssociationIds,
+                                  reportEntry,
+                                  user): Promise<ApiInspectReportEntry> {
+    let url = `${Http.baseUrl()}/projects/${projectId}/reports/${inspectReportId}/inspect-entries/${inspectReportEntryId}`;
+    return Http.put(url, user, reportEntry) as unknown as Promise<ApiInspectReportEntry>;
+  }
+
+  static updateInspectReport({ projectId, inspectReportId }: AssociationIds, report, user): Promise<ApiInspectReport> {
+    let url = `${Http.baseUrl()}/projects/${projectId}/reports/${inspectReportId}`;
+    return Http.put(url, user, report) as unknown as Promise<ApiInspectReport>;
+  }
+
+  static deleteInspectReport({ projectId, inspectReportId }: AssociationIds, user): Promise<void> {
+    let url = `${Http.baseUrl()}/projects/${projectId}/reports/${inspectReportId}`;
+    return Http.delete(url, user) as unknown as Promise<void>;
+  }
+
+  static deleteInspectReportEntry({ projectId, inspectReportId, inspectReportEntryId }: AssociationIds,
+                                  user: User): Promise<void> {
+    let url = `${Http.baseUrl()}/projects/${projectId}/reports/${inspectReportId}/inspect-entries/${inspectReportEntryId}`;
+    return Http.delete(url, user) as unknown as Promise<void>;
+  }
 }
 
-makeErrorsPretty(ReportApi);
+makeErrorsPretty(ReportApi);

package/source/api/scan_dataset_api.ts

@@ -1,9 +1,13 @@
-import ApiView, { ApiViewArgument } from "../models/api/api_view";
 import Http from "../utilities/http";
 import makeErrorsPretty from "../utilities/make_errors_pretty";
-import { ApiBuiltStatus, ApiDetailedElement, ApiPhotoSession, ApiScanDataset, ApiScanDatasetQaState, ApiScannedElementType, AssociationIds, DateLike } from "../models";
+import type { ApiBuiltStatus, ApiDetailedElement, ApiPhotoSession, ApiScanDatasetQaState, ApiScannedElementType, ApiView, ApiViewArgument, User } from "../models";
+import { ApiScanDataset } from "../models";
+import type { AssociationIds, DateLike } from "type_aliases";
 import { DateConverter } from "../converters";
-import { User } from "../utilities/get_authorization_headers";
+
+function isApiScanDataset(obj: any): obj is Partial<ApiScanDataset> {
+  return obj.scanDate != null || obj.name != null
+}
 
 export default class ScanDatasetApi {
   static listScanDatasetsForFloor({ projectId, floorId }: AssociationIds, user: User): Promise<ApiScanDataset[]> {
@@ -11,14 +15,24 @@ export default class ScanDatasetApi {
     return Http.get(url, user) as unknown as Promise<ApiScanDataset[]>;
   }
 
-  static createScanDataset({
-                             projectId,
-                             floorId
-                           }: AssociationIds, scanDate: DateLike, user: User): Promise<ApiScanDataset> {
-    const url = `${Http.baseUrl()}/projects/${projectId}/floors/${floorId}/scan-datasets?scanDate=${DateConverter.dateToISO(scanDate)}`;
-    return Http.post(url, user, null) as unknown as Promise<ApiScanDataset>;
+  static createScanDataset({ projectId, floorId }: AssociationIds,
+                           apiScanDataset: Partial<ApiScanDataset>,
+                           user: User): Promise<ApiScanDataset>
+  static createScanDataset({ projectId, floorId }: AssociationIds,
+                           scanDate: DateLike,
+                           user: User): Promise<ApiScanDataset>
+  static createScanDataset({ projectId, floorId }: AssociationIds,
+                           scan: Partial<ApiScanDataset> | DateLike,
+                           user: User): Promise<ApiScanDataset> {
+    const url = `${Http.baseUrl()}/projects/${projectId}/floors/${floorId}/scan-datasets`;
+    if (isApiScanDataset(scan)) {
+      return Http.post(url, user, scan) as unknown as Promise<ApiScanDataset>;
+    } else {
+      return Http.post(url + `?scanDate=${DateConverter.dateLikeToDate(scan).valueOf()}`, user) as unknown as Promise<ApiScanDataset>;
+    }
   }
 
+
   static deleteScanDataset({ projectId, floorId, scanDatasetId }: AssociationIds, user: User): Promise<void> {
     let url = `${Http.baseUrl()}/projects/${projectId}/floors/${floorId}/scan-datasets/${scanDatasetId}`;
     return Http.delete(url, user) as unknown as Promise<void>;
@@ -156,7 +170,7 @@ export default class ScanDatasetApi {
     return Http.post(url, user, { sessionDate }) as unknown as Promise<ApiPhotoSession>;
   }
 
-  static listScanDatasetsForProject({projectId}: AssociationIds, user: User): Promise<ApiScanDataset[]> {
+  static listScanDatasetsForProject({ projectId }: AssociationIds, user: User): Promise<ApiScanDataset[]> {
     const url = `${Http.baseUrl()}/projects/${projectId}/scan-datasets`;
     return Http.get(url, user) as unknown as Promise<ApiScanDataset[]>;
   }