avvir 0.4.15 → 0.4.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -942,9 +942,10 @@ var ProjectApi = /** @class */ (function () {
942
942
  var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/projects/" + projectId + "/masterformat-progress";
943
943
  return _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].post(url, user, progress);
944
944
  };
945
- ProjectApi.saveScheduledProjectMasterformatProgress = function (_a, progress, user) {
945
+ // TODO: Make schedule type an enum?
946
+ ProjectApi.saveScheduledProjectMasterformatProgress = function (_a, progress, scheduleType, user) {
946
947
  var projectId = _a.projectId;
947
- var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/projects/" + projectId + "/scheduled-masterformat-progress";
948
+ var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/projects/" + projectId + "/scheduled-masterformat-progress/" + scheduleType;
948
949
  return _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].post(url, user, progress);
949
950
  };
950
951
  ProjectApi.getProjectCostAnalysisProgress = function (_a, user) {
@@ -957,9 +958,10 @@ var ProjectApi = /** @class */ (function () {
957
958
  var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/projects/" + projectId + "/masterformat-progress";
958
959
  return _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].get(url, user);
959
960
  };
960
- ProjectApi.getScheduledProjectMasterformatProgress = function (_a, user) {
961
+ // TODO: Make schedule type an enum?
962
+ ProjectApi.getScheduledProjectMasterformatProgress = function (_a, scheduleType, user) {
961
963
  var projectId = _a.projectId;
962
- var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/projects/" + projectId + "/scheduled-masterformat-progress";
964
+ var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/projects/" + projectId + "/scheduled-masterformat-progress/" + scheduleType;
963
965
  return _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].get(url, user);
964
966
  };
965
967
  ProjectApi.listProjectFloorFiles = function (_a, user) {
@@ -970,7 +972,7 @@ var ProjectApi = /** @class */ (function () {
970
972
  ProjectApi.getProjectDeviationsReportTsvUrl = function (_a, fileName, user) {
971
973
  var projectId = _a.projectId;
972
974
  var baseUrl = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/projects/" + projectId + "/" + fileName + "_deviation-report.tsv";
973
- return Promise.resolve(_utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].addAuthToDownloadUrl(baseUrl, user));
975
+ return _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].addAuthToDownloadUrl(baseUrl, user);
974
976
  };
975
977
  ProjectApi.getProjectDeviationsReportTsv = function (_a, user) {
976
978
  var projectId = _a.projectId;
@@ -5296,6 +5298,7 @@ var Pipelines;
5296
5298
  Pipelines["GENERATE_BCF"] = "generate-bcf";
5297
5299
  Pipelines["COMPUTE_QA_STATISTICS"] = "compute-qa-statistics";
5298
5300
  Pipelines["PROJECT_EXPORT_REPORT"] = "ingest-project-export-report";
5301
+ Pipelines["COMPUTE_AND_SAVE_CLASHES"] = "compute-and-save-clashes";
5299
5302
  })(Pipelines || (Pipelines = {}));
5300
5303
  /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (Pipelines);
5301
5304
 
@@ -1,5 +1,5 @@
1
1
  import { User } from "../utilities/get_authorization_headers";
2
- import { AssociationIds, ApiProject, ApiProjectMasterformatProgress, ApiProjectCostAnalysisProgress, ApiCloudFile, ApiWorkPackage, ApiProjectListing } from "../models";
2
+ import { ApiCloudFile, ApiProject, ApiProjectCostAnalysisProgress, ApiProjectListing, ApiProjectMasterformatProgress, ApiWorkPackage, AssociationIds } from "../models";
3
3
  export default class ProjectApi {
4
4
  static listProjectsForOrganization(accountId: string, user: User): Promise<ApiProject[]>;
5
5
  static listAllProjectsForUser(user: User): Promise<ApiProject[]>;
@@ -16,12 +16,12 @@ export default class ProjectApi {
16
16
  static archiveProject(accountId: string, projectId: string, user: User): Promise<void>;
17
17
  static saveProjectCostAnalysisProgress({ projectId }: AssociationIds, progress: any, user: User): Promise<void>;
18
18
  static saveScannedProjectMasterformatProgress({ projectId }: AssociationIds, progress: ApiProjectMasterformatProgress, user: User): Promise<void>;
19
- static saveScheduledProjectMasterformatProgress({ projectId }: AssociationIds, progress: ApiProjectMasterformatProgress, user: User): Promise<void>;
19
+ static saveScheduledProjectMasterformatProgress({ projectId }: AssociationIds, progress: ApiProjectMasterformatProgress, scheduleType: "current" | "baseline", user: User): Promise<void>;
20
20
  static getProjectCostAnalysisProgress({ projectId }: AssociationIds, user: User): Promise<ApiProjectCostAnalysisProgress[]>;
21
21
  static getScannedProjectMasterformatProgress({ projectId }: AssociationIds, user: User): Promise<ApiProjectMasterformatProgress[]>;
22
- static getScheduledProjectMasterformatProgress({ projectId }: AssociationIds, user: User): Promise<ApiProjectMasterformatProgress[]>;
22
+ static getScheduledProjectMasterformatProgress({ projectId }: AssociationIds, scheduleType: "current" | "baseline", user: User): Promise<ApiProjectMasterformatProgress[]>;
23
23
  static listProjectFloorFiles({ projectId }: AssociationIds, user: User): Promise<ApiCloudFile[]>;
24
- static getProjectDeviationsReportTsvUrl({ projectId }: AssociationIds, fileName: string, user: User): Promise<string>;
24
+ static getProjectDeviationsReportTsvUrl({ projectId }: AssociationIds, fileName: string, user: User): string;
25
25
  static getProjectDeviationsReportTsv({ projectId }: AssociationIds, user: User): Promise<string>;
26
26
  static getWorkPackages(projectId: string, user: User): Promise<ApiWorkPackage[]>;
27
27
  static saveWorkPackages(projectId: string, user: User, workPackages: ApiWorkPackage[]): Promise<ApiWorkPackage[]>;
@@ -44,8 +44,9 @@ export default class ProjectApi {
44
44
  const url = `${Http.baseUrl()}/projects/${projectId}/masterformat-progress`;
45
45
  return Http.post(url, user, progress);
46
46
  }
47
- static saveScheduledProjectMasterformatProgress({ projectId }, progress, user) {
48
- const url = `${Http.baseUrl()}/projects/${projectId}/scheduled-masterformat-progress`;
47
+ // TODO: Make schedule type an enum?
48
+ static saveScheduledProjectMasterformatProgress({ projectId }, progress, scheduleType, user) {
49
+ const url = `${Http.baseUrl()}/projects/${projectId}/scheduled-masterformat-progress/${scheduleType}`;
49
50
  return Http.post(url, user, progress);
50
51
  }
51
52
  static getProjectCostAnalysisProgress({ projectId }, user) {
@@ -56,8 +57,9 @@ export default class ProjectApi {
56
57
  let url = `${Http.baseUrl()}/projects/${projectId}/masterformat-progress`;
57
58
  return Http.get(url, user);
58
59
  }
59
- static getScheduledProjectMasterformatProgress({ projectId }, user) {
60
- let url = `${Http.baseUrl()}/projects/${projectId}/scheduled-masterformat-progress`;
60
+ // TODO: Make schedule type an enum?
61
+ static getScheduledProjectMasterformatProgress({ projectId }, scheduleType, user) {
62
+ let url = `${Http.baseUrl()}/projects/${projectId}/scheduled-masterformat-progress/${scheduleType}`;
61
63
  return Http.get(url, user);
62
64
  }
63
65
  static listProjectFloorFiles({ projectId }, user) {
@@ -66,7 +68,7 @@ export default class ProjectApi {
66
68
  }
67
69
  static getProjectDeviationsReportTsvUrl({ projectId }, fileName, user) {
68
70
  const baseUrl = `${Http.baseUrl()}/projects/${projectId}/${fileName}_deviation-report.tsv`;
69
- return Promise.resolve(Http.addAuthToDownloadUrl(baseUrl, user));
71
+ return Http.addAuthToDownloadUrl(baseUrl, user);
70
72
  }
71
73
  static getProjectDeviationsReportTsv({ projectId }, user) {
72
74
  const baseUrl = `${Http.baseUrl()}/projects/${projectId}/project_deviation-report.tsv`;
@@ -1 +1 @@
1
- {"version":3,"file":"project_api.js","sourceRoot":"","sources":["../../../source/api/project_api.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"project_api.js","sourceRoot":"","sources":["../../../source/api/project_api.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- export declare type PipelineName = "downsample-scan" | "ingest-scan" | "convert-ifc-and-process-scans" | "generate-ifc" | "create-and-process-svf" | "download-and-zip-project-files-folder" | "pipeline-steps" | "ingest-external-photo-project-data" | "ingest-project-file" | "convert-e57-to-las" | "convert-and-process-e57" | "ingest-las-or-e57" | "generate-bcf" | "compute-qa-statistics" | "ingest-project-export-report";
1
+ export declare type PipelineName = "downsample-scan" | "ingest-scan" | "convert-ifc-and-process-scans" | "generate-ifc" | "create-and-process-svf" | "download-and-zip-project-files-folder" | "pipeline-steps" | "ingest-external-photo-project-data" | "ingest-project-file" | "convert-e57-to-las" | "convert-and-process-e57" | "ingest-las-or-e57" | "generate-bcf" | "compute-qa-statistics" | "ingest-project-export-report" | "compute-and-save-clashes";
2
2
  export declare enum Pipelines {
3
3
  INGEST_PROJECT_FILE = "ingest-project-file",
4
4
  PIPELINE_STEPS = "pipeline-steps",
@@ -14,6 +14,7 @@ export declare enum Pipelines {
14
14
  INGEST_LAS_OR_E57 = "ingest-las-or-e57",
15
15
  GENERATE_BCF = "generate-bcf",
16
16
  COMPUTE_QA_STATISTICS = "compute-qa-statistics",
17
- PROJECT_EXPORT_REPORT = "ingest-project-export-report"
17
+ PROJECT_EXPORT_REPORT = "ingest-project-export-report",
18
+ COMPUTE_AND_SAVE_CLASHES = "compute-and-save-clashes"
18
19
  }
19
20
  export default Pipelines;
@@ -15,6 +15,7 @@ export var Pipelines;
15
15
  Pipelines["GENERATE_BCF"] = "generate-bcf";
16
16
  Pipelines["COMPUTE_QA_STATISTICS"] = "compute-qa-statistics";
17
17
  Pipelines["PROJECT_EXPORT_REPORT"] = "ingest-project-export-report";
18
+ Pipelines["COMPUTE_AND_SAVE_CLASHES"] = "compute-and-save-clashes";
18
19
  })(Pipelines || (Pipelines = {}));
19
20
  export default Pipelines;
20
21
  //# sourceMappingURL=pipeline_types.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"pipeline_types.js","sourceRoot":"","sources":["../../../../source/models/enums/pipeline_types.ts"],"names":[],"mappings":"AAgBA,MAAM,CAAN,IAAY,SAgBX;AAhBD,WAAY,SAAS;IACnB,wDAA2C,CAAA;IAC3C,8CAAiC,CAAA;IACjC,gDAAmC,CAAA;IACnC,wCAA2B,CAAA;IAC3B,4EAA+D,CAAA;IAC/D,4FAA+E,CAAA;IAC/E,sFAAyE,CAAA;IACzE,0CAA6B,CAAA;IAC7B,8DAAiD,CAAA;IACjD,sDAAyC,CAAA;IACzC,gEAAmD,CAAA;IACnD,oDAAuC,CAAA;IACvC,0CAA6B,CAAA;IAC7B,4DAA+C,CAAA;IAC/C,mEAAsD,CAAA;AACxD,CAAC,EAhBW,SAAS,KAAT,SAAS,QAgBpB;AAED,eAAe,SAAS,CAAC"}
1
+ {"version":3,"file":"pipeline_types.js","sourceRoot":"","sources":["../../../../source/models/enums/pipeline_types.ts"],"names":[],"mappings":"AAkBA,MAAM,CAAN,IAAY,SAiBX;AAjBD,WAAY,SAAS;IACnB,wDAA2C,CAAA;IAC3C,8CAAiC,CAAA;IACjC,gDAAmC,CAAA;IACnC,wCAA2B,CAAA;IAC3B,4EAA+D,CAAA;IAC/D,4FAA+E,CAAA;IAC/E,sFAAyE,CAAA;IACzE,0CAA6B,CAAA;IAC7B,8DAAiD,CAAA;IACjD,sDAAyC,CAAA;IACzC,gEAAmD,CAAA;IACnD,oDAAuC,CAAA;IACvC,0CAA6B,CAAA;IAC7B,4DAA+C,CAAA;IAC/C,mEAAsD,CAAA;IACtD,kEAAqD,CAAA;AACvD,CAAC,EAjBW,SAAS,KAAT,SAAS,QAiBpB;AAED,eAAe,SAAS,CAAC"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "avvir",
3
3
  "repository": "git@github.com:Avvir/avvir-javascript-client.git",
4
- "version": "0.4.15",
4
+ "version": "0.4.17",
5
5
  "description": "Javascript client for Avvir APIs",
6
6
  "license": "Apache-2.0",
7
7
  "module": "dist/esm/index.js",
@@ -76,5 +76,13 @@
76
76
  "three": "0.110.0",
77
77
  "underscore": "^1.12.0",
78
78
  "util": "^0.12.4"
79
+ },
80
+ "mocha": {
81
+ "require": [
82
+ "./tests/test_utils/mocha_setup.js",
83
+ "./tests/test_utils/setup_tests.ts"
84
+ ],
85
+ "exit": true,
86
+ "ui": "bdd"
79
87
  }
80
88
  }
@@ -1,17 +1,8 @@
1
- import {User} from "../utilities/get_authorization_headers";
1
+ import { User } from "../utilities/get_authorization_headers";
2
2
  import Http from "../utilities/http";
3
3
  import makeErrorsPretty from "../utilities/make_errors_pretty";
4
4
 
5
- import {
6
- AssociationIds,
7
- ApiProject,
8
- ApiProjectMasterformatProgress,
9
- ApiProjectCostAnalysisProgress,
10
- ApiCloudFile,
11
- ApiWorkPackage,
12
- ApiProjectListing, ApiPurposeType, PurposeType
13
- } from "../models";
14
- import PurposeTypeConverter from "../converters/purpose_type_converter";
5
+ import { ApiCloudFile, ApiProject, ApiProjectCostAnalysisProgress, ApiProjectListing, ApiProjectMasterformatProgress, ApiWorkPackage, AssociationIds } from "../models";
15
6
 
16
7
  export default class ProjectApi {
17
8
  static listProjectsForOrganization(accountId: string, user: User): Promise<ApiProject[]> {
@@ -57,61 +48,72 @@ export default class ProjectApi {
57
48
  return Http.post(url, user, null) as unknown as Promise<void>;
58
49
  }
59
50
 
60
- static saveProjectCostAnalysisProgress({projectId}: AssociationIds, progress, user: User): Promise<void> {
51
+ static saveProjectCostAnalysisProgress({ projectId }: AssociationIds, progress, user: User): Promise<void> {
61
52
  const url = `${Http.baseUrl()}/projects/${projectId}/cost-analysis-progress`;
62
53
  return Http.post(url, user, progress) as unknown as Promise<void>;
63
54
  }
64
55
 
65
- static saveScannedProjectMasterformatProgress({projectId}: AssociationIds, progress: ApiProjectMasterformatProgress, user: User): Promise<void> {
56
+ static saveScannedProjectMasterformatProgress({ projectId }: AssociationIds,
57
+ progress: ApiProjectMasterformatProgress,
58
+ user: User): Promise<void> {
66
59
  const url = `${Http.baseUrl()}/projects/${projectId}/masterformat-progress`;
67
60
  return Http.post(url, user, progress) as unknown as Promise<void>;
68
61
  }
69
62
 
70
- static saveScheduledProjectMasterformatProgress({projectId}: AssociationIds, progress: ApiProjectMasterformatProgress, user: User): Promise<void> {
71
- const url = `${Http.baseUrl()}/projects/${projectId}/scheduled-masterformat-progress`;
63
+ // TODO: Make schedule type an enum?
64
+ static saveScheduledProjectMasterformatProgress({ projectId }: AssociationIds,
65
+ progress: ApiProjectMasterformatProgress,
66
+ scheduleType: "current" | "baseline",
67
+ user: User): Promise<void> {
68
+ const url = `${Http.baseUrl()}/projects/${projectId}/scheduled-masterformat-progress/${scheduleType}`;
72
69
  return Http.post(url, user, progress) as unknown as Promise<void>;
73
70
  }
74
71
 
75
- static getProjectCostAnalysisProgress({projectId}: AssociationIds, user: User): Promise<ApiProjectCostAnalysisProgress[]> {
72
+ static getProjectCostAnalysisProgress({ projectId }: AssociationIds,
73
+ user: User): Promise<ApiProjectCostAnalysisProgress[]> {
76
74
  const url = `${Http.baseUrl()}/projects/${projectId}/cost-analysis-progress`;
77
75
  return Http.get(url, user) as unknown as Promise<ApiProjectCostAnalysisProgress[]>;
78
76
  }
79
77
 
80
- static getScannedProjectMasterformatProgress({projectId}: AssociationIds, user: User): Promise<ApiProjectMasterformatProgress[]> {
78
+ static getScannedProjectMasterformatProgress({ projectId }: AssociationIds,
79
+ user: User): Promise<ApiProjectMasterformatProgress[]> {
81
80
  let url = `${Http.baseUrl()}/projects/${projectId}/masterformat-progress`;
82
81
  return Http.get(url, user) as unknown as Promise<ApiProjectMasterformatProgress[]>;
83
82
  }
84
83
 
85
- static getScheduledProjectMasterformatProgress({projectId}: AssociationIds, user: User): Promise<ApiProjectMasterformatProgress[]> {
86
- let url = `${Http.baseUrl()}/projects/${projectId}/scheduled-masterformat-progress`;
84
+ // TODO: Make schedule type an enum?
85
+ static getScheduledProjectMasterformatProgress({ projectId }: AssociationIds,
86
+ scheduleType: "current" | "baseline",
87
+ user: User): Promise<ApiProjectMasterformatProgress[]> {
88
+ let url = `${Http.baseUrl()}/projects/${projectId}/scheduled-masterformat-progress/${scheduleType}`;
87
89
  return Http.get(url, user) as unknown as Promise<ApiProjectMasterformatProgress[]>;
88
90
  }
89
91
 
90
- static listProjectFloorFiles({projectId}: AssociationIds, user: User): Promise<ApiCloudFile[]> {
92
+ static listProjectFloorFiles({ projectId }: AssociationIds, user: User): Promise<ApiCloudFile[]> {
91
93
  let url = `${Http.baseUrl()}/projects/${projectId}/floor-files`;
92
94
  return Http.get(url, user) as unknown as Promise<ApiCloudFile[]>;
93
95
  }
94
96
 
95
- static getProjectDeviationsReportTsvUrl({projectId}: AssociationIds, fileName: string, user: User): Promise<string> {
97
+ static getProjectDeviationsReportTsvUrl({ projectId }: AssociationIds, fileName: string, user: User): string {
96
98
  const baseUrl = `${Http.baseUrl()}/projects/${projectId}/${fileName}_deviation-report.tsv`;
97
- return Promise.resolve(Http.addAuthToDownloadUrl(baseUrl, user));
99
+ return Http.addAuthToDownloadUrl(baseUrl, user);
98
100
  }
99
101
 
100
- static getProjectDeviationsReportTsv({projectId}: AssociationIds, user: User): Promise<string> {
102
+ static getProjectDeviationsReportTsv({ projectId }: AssociationIds, user: User): Promise<string> {
101
103
  const baseUrl = `${Http.baseUrl()}/projects/${projectId}/project_deviation-report.tsv`;
102
104
  const url = Http.addAuthToDownloadUrl(baseUrl, user);
103
105
  return Http.get(url, user, "text/tab-separated-values; charset=utf-8") as unknown as Promise<string>;
104
106
  }
105
107
 
106
- static getWorkPackages(projectId: string, user:User) {
108
+ static getWorkPackages(projectId: string, user: User) {
107
109
  let url = `${Http.baseUrl()}/projects/${projectId}/work-packages`;
108
110
  return Http.get(url, user) as unknown as Promise<ApiWorkPackage[]>;
109
111
  }
110
112
 
111
- static saveWorkPackages(projectId: string, user:User, workPackages: ApiWorkPackage[]) {
113
+ static saveWorkPackages(projectId: string, user: User, workPackages: ApiWorkPackage[]) {
112
114
  let url = `${Http.baseUrl()}/projects/${projectId}/work-packages`;
113
115
  return Http.put(url, user, workPackages) as unknown as Promise<ApiWorkPackage[]>;
114
116
  }
115
117
  }
116
118
 
117
- makeErrorsPretty(ProjectApi);
119
+ makeErrorsPretty(ProjectApi);
@@ -1,18 +1,20 @@
1
- export type PipelineName = "downsample-scan" |
2
- "ingest-scan" |
3
- "convert-ifc-and-process-scans" |
4
- "generate-ifc" |
5
- "create-and-process-svf" |
6
- "download-and-zip-project-files-folder" |
7
- "pipeline-steps" |
8
- "ingest-external-photo-project-data" |
9
- "ingest-project-file" |
10
- "convert-e57-to-las" |
11
- "convert-and-process-e57" |
12
- "ingest-las-or-e57" |
13
- "generate-bcf" |
14
- "compute-qa-statistics" |
15
- "ingest-project-export-report"
1
+ export type PipelineName =
2
+ | "downsample-scan"
3
+ | "ingest-scan"
4
+ | "convert-ifc-and-process-scans"
5
+ | "generate-ifc"
6
+ | "create-and-process-svf"
7
+ | "download-and-zip-project-files-folder"
8
+ | "pipeline-steps"
9
+ | "ingest-external-photo-project-data"
10
+ | "ingest-project-file"
11
+ | "convert-e57-to-las"
12
+ | "convert-and-process-e57"
13
+ | "ingest-las-or-e57"
14
+ | "generate-bcf"
15
+ | "compute-qa-statistics"
16
+ | "ingest-project-export-report"
17
+ | "compute-and-save-clashes"
16
18
 
17
19
  export enum Pipelines {
18
20
  INGEST_PROJECT_FILE = "ingest-project-file",
@@ -29,7 +31,8 @@ export enum Pipelines {
29
31
  INGEST_LAS_OR_E57 = "ingest-las-or-e57",
30
32
  GENERATE_BCF = "generate-bcf",
31
33
  COMPUTE_QA_STATISTICS = "compute-qa-statistics",
32
- PROJECT_EXPORT_REPORT = "ingest-project-export-report"
34
+ PROJECT_EXPORT_REPORT = "ingest-project-export-report",
35
+ COMPUTE_AND_SAVE_CLASHES = "compute-and-save-clashes",
33
36
  }
34
37
 
35
38
  export default Pipelines;