avvir 0.4.19 → 0.4.21

package/dist/avvir_api.node.js

@@ -740,8 +740,8 @@ var OrganizationApi = /** @class */ (function () {
         var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/client-accounts";
         return _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].post(url, user, organization);
     };
-    OrganizationApi.updateOrganization = function (accountId, organization, user) {
-        var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/client-accounts/" + accountId;
+    OrganizationApi.updateOrganization = function (organizationId, organization, user) {
+        var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/client-accounts/" + organizationId;
         return _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].patch(url, user, organization);
     };
     OrganizationApi.getScanDataSetStats = function (user) {
@@ -848,8 +848,8 @@ var PipelineApi = /** @class */ (function () {
     }
     PipelineApi.triggerJobStepsPipeline = function (associationIds, body, user) {
         if (body === void 0) { body = {}; }
-        var accountId = associationIds.accountId, projectId = associationIds.projectId, floorId = associationIds.floorId, scanDatasetId = associationIds.scanDatasetId;
-        var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/pipeline/" + accountId + "/" + projectId + "/" + floorId + "/" + scanDatasetId + "/trigger";
+        var organizationId = associationIds.organizationId, projectId = associationIds.projectId, floorId = associationIds.floorId, scanDatasetId = associationIds.scanDatasetId;
+        var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/pipeline/" + organizationId + "/" + projectId + "/" + floorId + "/" + scanDatasetId + "/trigger";
         return _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].post(url, user, body);
     };
     PipelineApi.triggerPipeline = function (body, user) {
@@ -897,8 +897,8 @@ __webpack_require__.r(__webpack_exports__);
 var ProjectApi = /** @class */ (function () {
     function ProjectApi() {
     }
-    ProjectApi.listProjectsForOrganization = function (accountId, user) {
-        var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/client-accounts/" + accountId + "/projects";
+    ProjectApi.listProjectsForOrganization = function (organizationId, user) {
+        var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/client-accounts/" + organizationId + "/projects";
         return _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].get(url, user);
     };
     ProjectApi.listAllProjectsForUser = function (user) {
@@ -920,18 +920,22 @@ var ProjectApi = /** @class */ (function () {
         var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/projects/" + projectId;
         return _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].get(url, user);
     };
-    ProjectApi.createProject = function (accountId, project, user) {
-        var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/client-accounts/" + accountId + "/projects";
+    ProjectApi.createProject = function (organizationId, project, user) {
+        var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/client-accounts/" + organizationId + "/projects";
         return _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].post(url, user, project);
     };
     ProjectApi.updateProject = function (projectId, project, user) {
         var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/projects/" + projectId;
         return _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].patch(url, user, project);
     };
-    ProjectApi.archiveProject = function (accountId, projectId, user) {
+    ProjectApi.archiveProject = function (projectId, user) {
         var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/projects/" + projectId + "/archive";
         return _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].post(url, user, null);
     };
+    ProjectApi.unarchiveProject = function (projectId, user) {
+        var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/projects/" + projectId + "/unarchive";
+        return _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].post(url, user, null);
+    };
     ProjectApi.saveProjectCostAnalysisProgress = function (_a, progress, user) {
         var projectId = _a.projectId;
         var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/projects/" + projectId + "/cost-analysis-progress";
@@ -939,7 +943,7 @@ var ProjectApi = /** @class */ (function () {
     };
     ProjectApi.saveScannedProjectMasterformatProgress = function (_a, progress, user) {
         var projectId = _a.projectId;
-        var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/projects/" + projectId + "/masterformat-progress";
+        var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/projects/" + projectId + "/scanned-masterformat-progress";
         return _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].post(url, user, progress);
     };
     // TODO: Make schedule type an enum?
@@ -955,7 +959,7 @@ var ProjectApi = /** @class */ (function () {
     };
     ProjectApi.getScannedProjectMasterformatProgress = function (_a, user) {
         var projectId = _a.projectId;
-        var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/projects/" + projectId + "/masterformat-progress";
+        var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/projects/" + projectId + "/scanned-masterformat-progress";
         return _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].get(url, user);
     };
     // TODO: Make schedule type an enum?

package/dist/esm/api/organization_api.d.ts

@@ -10,6 +10,6 @@ export default class OrganizationApi {
     static createOrganization(organization: ApiOrganization, user: User): Promise<{
         firebaseId: string;
     }>;
-    static updateOrganization(accountId: string, organization: ApiOrganization, user: User): Promise<void>;
+    static updateOrganization(organizationId: string, organization: ApiOrganization, user: User): Promise<void>;
     static getScanDataSetStats(user: User): Promise<ApiScanDatasetStats[]>;
 }

package/dist/esm/api/organization_api.js

@@ -21,8 +21,8 @@ export default class OrganizationApi {
         let url = `${Http.baseUrl()}/client-accounts`;
         return Http.post(url, user, organization);
     }
-    static updateOrganization(accountId, organization, user) {
-        let url = `${Http.baseUrl()}/client-accounts/${accountId}`;
+    static updateOrganization(organizationId, organization, user) {
+        let url = `${Http.baseUrl()}/client-accounts/${organizationId}`;
         return Http.patch(url, user, organization);
     }
     static getScanDataSetStats(user) {

package/dist/esm/api/organization_api.js.map

@@ -1 +1 @@
-{"version":3,"file":"organization_api.js","sourceRoot":"","sources":["../../../source/api/organization_api.ts"],"names":[],"mappings":"AAGA,OAAO,IAAI,MAAM,mBAAmB,CAAC;AACrC,OAAO,gBAAgB,MAAM,iCAAiC,CAAC;AAK/D,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,MAAM,CAAC,iBAAiB,CAAC,IAAU;QACjC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,kBAAkB,CAAC;QAC9C,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,CAAC,eAAe,CAAC,cAAsB,EAAE,IAAU;QACvD,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,oBAAoB,cAAc,EAAE,CAAC;QAChE,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,CAAC,mBAAmB,CAAC,cAAsB,EAAE,IAAU;QAC3D,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,oBAAoB,cAAc,OAAO,CAAC;QACrE,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,CAAC,uBAAuB,CAAC,cAAsB,EAAE,IAAU;QAC/D,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,oBAAoB,cAAc,QAAQ,CAAC;QACtE,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,CAAC,kBAAkB,CAAC,YAA6B,EAAE,IAAU;QACjE,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,kBAAkB,CAAC;QAC9C,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,kBAAkB,CAAC,SAAiB,EAAE,YAA6B,EAAE,IAAU;QACpF,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,oBAAoB,SAAS,EAAE,CAAC;QAC3D,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;IAC7C,CAAC;IAED,MAAM,CAAC,mBAAmB,CAAC,IAAU;QACnC,IAAI,GAAG,GAAI,GAAG,IAAI,CAAC,OAAO,EAAE,qCAAqC,CAAC;QAClE,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAA8C,CAAC;IAC1E,CAAC;CACF;AAED,gBAAgB,CAAC,eAAe,CAAC,CAAC"}
+{"version":3,"file":"organization_api.js","sourceRoot":"","sources":["../../../source/api/organization_api.ts"],"names":[],"mappings":"AAGA,OAAO,IAAI,MAAM,mBAAmB,CAAC;AACrC,OAAO,gBAAgB,MAAM,iCAAiC,CAAC;AAI/D,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,MAAM,CAAC,iBAAiB,CAAC,IAAU;QACjC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,kBAAkB,CAAC;QAC9C,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,CAAC,eAAe,CAAC,cAAsB,EAAE,IAAU;QACvD,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,oBAAoB,cAAc,EAAE,CAAC;QAChE,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,CAAC,mBAAmB,CAAC,cAAsB,EAAE,IAAU;QAC3D,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,oBAAoB,cAAc,OAAO,CAAC;QACrE,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,CAAC,uBAAuB,CAAC,cAAsB,EAAE,IAAU;QAC/D,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,oBAAoB,cAAc,QAAQ,CAAC;QACtE,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,CAAC,kBAAkB,CAAC,YAA6B,EAAE,IAAU;QACjE,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,kBAAkB,CAAC;QAC9C,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,kBAAkB,CAAC,cAAsB,EAAE,YAA6B,EAAE,IAAU;QACzF,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,oBAAoB,cAAc,EAAE,CAAC;QAChE,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;IAC7C,CAAC;IAED,MAAM,CAAC,mBAAmB,CAAC,IAAU;QACnC,IAAI,GAAG,GAAI,GAAG,IAAI,CAAC,OAAO,EAAE,qCAAqC,CAAC;QAClE,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAA8C,CAAC;IAC1E,CAAC;CACF;AAED,gBAAgB,CAAC,eAAe,CAAC,CAAC"}

package/dist/esm/api/pipeline_api.js

@@ -2,8 +2,8 @@ import Http from "../utilities/http";
 import makeErrorsPretty from "../utilities/make_errors_pretty";
 export default class PipelineApi {
     static triggerJobStepsPipeline(associationIds, body = {}, user) {
-        let { accountId, projectId, floorId, scanDatasetId } = associationIds;
-        const url = `${Http.baseUrl()}/pipeline/${accountId}/${projectId}/${floorId}/${scanDatasetId}/trigger`;
+        const { organizationId, projectId, floorId, scanDatasetId } = associationIds;
+        const url = `${Http.baseUrl()}/pipeline/${organizationId}/${projectId}/${floorId}/${scanDatasetId}/trigger`;
         return Http.post(url, user, body);
     }
     static triggerPipeline(body = {}, user) {

package/dist/esm/api/pipeline_api.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline_api.js","sourceRoot":"","sources":["../../../source/api/pipeline_api.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,mBAAmB,CAAC;AACrC,OAAO,gBAAgB,MAAM,iCAAiC,CAAC;AAI/D,MAAM,CAAC,OAAO,OAAO,WAAW;IAC9B,MAAM,CAAC,uBAAuB,CAAC,cAA8B,EAAE,IAAI,GAAG,EAAE,EAAE,IAAU;QAClF,IAAI,EAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,EAAC,GAAG,cAAc,CAAC;QACpE,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,SAAS,IAAI,SAAS,IAAI,OAAO,IAAI,aAAa,UAAU,CAAC;QACvG,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAoC,CAAC;IACvE,CAAC;IAED,MAAM,CAAC,eAAe,CAAC,OAA4B,EAAE,EAAE,IAAU;QAC/D,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC;QAC1C,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAoC,CAAC;IACvE,CAAC;IAED,MAAM,CAAC,kCAAkC,CAAC,cAA8B,EAAE,IAAI,GAAG,EAAE,EAAE,IAAU;QAC7F,IAAI,EAAC,cAAc,EAAE,SAAS,EAAC,GAAG,cAAc,CAAC;QACjD,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,cAAc,IAAI,SAAS,uCAAuC,CAAC;QAC7G,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAoC,CAAC;IACvE,CAAC;IAED,MAAM,CAAC,mBAAmB,CAAC,EAAC,SAAS,EAAiB,EAAE,UAAkB,EAAE,IAAU;QACpF,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,cAAc,UAAU,EAAE,CAAC;QACxD,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAoC,CAAC;IAChE,CAAC;IAED,MAAM,CAAC,iBAAiB,CAAC,EAAC,SAAS,EAAE,OAAO,EAAiB,EAAE,IAAU;QACvE,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,SAAS,WAAW,OAAO,YAAY,CAAC;QAClF,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAsC,CAAC;IAClE,CAAC;CACF;AAED,gBAAgB,CAAC,WAAW,CAAC,CAAA"}
+{"version":3,"file":"pipeline_api.js","sourceRoot":"","sources":["../../../source/api/pipeline_api.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,mBAAmB,CAAC;AACrC,OAAO,gBAAgB,MAAM,iCAAiC,CAAC;AAI/D,MAAM,CAAC,OAAO,OAAO,WAAW;IAC9B,MAAM,CAAC,uBAAuB,CAAC,cAA8B,EAAE,IAAI,GAAG,EAAE,EAAE,IAAU;QAClF,MAAM,EAAC,cAAc,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,EAAC,GAAG,cAAc,CAAC;QAC3E,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,cAAc,IAAI,SAAS,IAAI,OAAO,IAAI,aAAa,UAAU,CAAC;QAC5G,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAoC,CAAC;IACvE,CAAC;IAED,MAAM,CAAC,eAAe,CAAC,OAA4B,EAAE,EAAE,IAAU;QAC/D,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC;QAC1C,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAoC,CAAC;IACvE,CAAC;IAED,MAAM,CAAC,kCAAkC,CAAC,cAA8B,EAAE,IAAI,GAAG,EAAE,EAAE,IAAU;QAC7F,IAAI,EAAC,cAAc,EAAE,SAAS,EAAC,GAAG,cAAc,CAAC;QACjD,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,cAAc,IAAI,SAAS,uCAAuC,CAAC;QAC7G,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAoC,CAAC;IACvE,CAAC;IAED,MAAM,CAAC,mBAAmB,CAAC,EAAC,SAAS,EAAiB,EAAE,UAAkB,EAAE,IAAU;QACpF,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,cAAc,UAAU,EAAE,CAAC;QACxD,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAoC,CAAC;IAChE,CAAC;IAED,MAAM,CAAC,iBAAiB,CAAC,EAAC,SAAS,EAAE,OAAO,EAAiB,EAAE,IAAU;QACvE,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,SAAS,WAAW,OAAO,YAAY,CAAC;QAClF,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAsC,CAAC;IAClE,CAAC;CACF;AAED,gBAAgB,CAAC,WAAW,CAAC,CAAA"}

package/dist/esm/api/project_api.d.ts

@@ -1,7 +1,7 @@
 import { User } from "../utilities/get_authorization_headers";
 import { ApiCloudFile, ApiProject, ApiProjectCostAnalysisProgress, ApiProjectListing, ApiProjectMasterformatProgress, ApiWorkPackage, AssociationIds } from "../models";
 export default class ProjectApi {
-    static listProjectsForOrganization(accountId: string, user: User): Promise<ApiProject[]>;
+    static listProjectsForOrganization(organizationId: string, user: User): Promise<ApiProject[]>;
     static listAllProjectsForUser(user: User): Promise<ApiProject[]>;
     static listProjectsForUser(user: User): Promise<ApiProjectListing[]>;
     /**
@@ -9,11 +9,12 @@ export default class ProjectApi {
      */
     static listProjects(projectId: string, user: User): Promise<ApiProject[]>;
     static getProject(projectId: string, user: User): Promise<ApiProject>;
-    static createProject(accountId: string, project: ApiProject, user: User): Promise<{
+    static createProject(organizationId: string, project: ApiProject, user: User): Promise<{
         firebaseId: string;
     }>;
     static updateProject(projectId: string, project: ApiProject, user: User): Promise<void>;
-    static archiveProject(accountId: string, projectId: string, user: User): Promise<void>;
+    static archiveProject(projectId: string, user: User): Promise<void>;
+    static unarchiveProject(projectId: string, user: User): Promise<void>;
     static saveProjectCostAnalysisProgress({ projectId }: AssociationIds, progress: any, user: User): Promise<void>;
     static saveScannedProjectMasterformatProgress({ projectId }: AssociationIds, progress: ApiProjectMasterformatProgress, user: User): Promise<void>;
     static saveScheduledProjectMasterformatProgress({ projectId }: AssociationIds, progress: ApiProjectMasterformatProgress, scheduleType: "current" | "baseline", user: User): Promise<void>;

package/dist/esm/api/project_api.js

@@ -1,8 +1,8 @@
 import Http from "../utilities/http";
 import makeErrorsPretty from "../utilities/make_errors_pretty";
 export default class ProjectApi {
-    static listProjectsForOrganization(accountId, user) {
-        let url = `${Http.baseUrl()}/client-accounts/${accountId}/projects`;
+    static listProjectsForOrganization(organizationId, user) {
+        let url = `${Http.baseUrl()}/client-accounts/${organizationId}/projects`;
         return Http.get(url, user);
     }
     static listAllProjectsForUser(user) {
@@ -24,24 +24,28 @@ export default class ProjectApi {
         let url = `${Http.baseUrl()}/projects/${projectId}`;
         return Http.get(url, user);
     }
-    static createProject(accountId, project, user) {
-        let url = `${Http.baseUrl()}/client-accounts/${accountId}/projects`;
+    static createProject(organizationId, project, user) {
+        let url = `${Http.baseUrl()}/client-accounts/${organizationId}/projects`;
         return Http.post(url, user, project);
     }
     static updateProject(projectId, project, user) {
         let url = `${Http.baseUrl()}/projects/${projectId}`;
         return Http.patch(url, user, project);
     }
-    static archiveProject(accountId, projectId, user) {
+    static archiveProject(projectId, user) {
         let url = `${Http.baseUrl()}/projects/${projectId}/archive`;
         return Http.post(url, user, null);
     }
+    static unarchiveProject(projectId, user) {
+        let url = `${Http.baseUrl()}/projects/${projectId}/unarchive`;
+        return Http.post(url, user, null);
+    }
     static saveProjectCostAnalysisProgress({ projectId }, progress, user) {
         const url = `${Http.baseUrl()}/projects/${projectId}/cost-analysis-progress`;
         return Http.post(url, user, progress);
     }
     static saveScannedProjectMasterformatProgress({ projectId }, progress, user) {
-        const url = `${Http.baseUrl()}/projects/${projectId}/masterformat-progress`;
+        const url = `${Http.baseUrl()}/projects/${projectId}/scanned-masterformat-progress`;
         return Http.post(url, user, progress);
     }
     // TODO: Make schedule type an enum?
@@ -54,7 +58,7 @@ export default class ProjectApi {
         return Http.get(url, user);
     }
     static getScannedProjectMasterformatProgress({ projectId }, user) {
-        let url = `${Http.baseUrl()}/projects/${projectId}/masterformat-progress`;
+        let url = `${Http.baseUrl()}/projects/${projectId}/scanned-masterformat-progress`;
         return Http.get(url, user);
     }
     // TODO: Make schedule type an enum?

package/dist/esm/api/project_api.js.map

@@ -1 +1 @@
-{"version":3,"file":"project_api.js","sourceRoot":"","sources":["../../../source/api/project_api.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"project_api.js","sourceRoot":"","sources":["../../../source/api/project_api.ts"],"names":[],"mappings":"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"}

package/dist/esm/models/api/type_aliases.d.ts

@@ -4,7 +4,6 @@ import ApiMatrix3 from "./api_matrix_3";
 import ApiMatrix4 from "./api_matrix_4";
 import { ApiQuaternion } from "./api_quaternion";
 export declare type AssociationIds = {
-    accountId?: string;
     commentThreadId?: number;
     commentId?: number;
     organizationId?: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "avvir",
   "repository": "git@github.com:Avvir/avvir-javascript-client.git",
-  "version": "0.4.19",
+  "version": "0.4.21",
   "description": "Javascript client for Avvir APIs",
   "license": "Apache-2.0",
   "module": "dist/esm/index.js",

package/source/api/organization_api.ts

@@ -1,11 +1,10 @@
 // @ts-nocheck
 import ApiOrganization from "../models/api/api_organization";
-import {User} from "../utilities/get_authorization_headers";
+import { User } from "../utilities/get_authorization_headers";
 import Http from "../utilities/http";
 import makeErrorsPretty from "../utilities/make_errors_pretty";
-import {List} from "underscore";
 import ApiUserForOrganization from "../models/api/api_user_for_organization";
-import {ApiScanDatasetStats} from "../models/api/api_scandataset_stats";
+import { ApiScanDatasetStats } from "../models/api/api_scandataset_stats";
 
 export default class OrganizationApi {
   static listOrganizations(user: User): Promise<ApiOrganization[]> {
@@ -33,8 +32,8 @@ export default class OrganizationApi {
     return Http.post(url, user, organization);
   }
 
-  static updateOrganization(accountId: string, organization: ApiOrganization, user: User): Promise<void> {
-    let url = `${Http.baseUrl()}/client-accounts/${accountId}`;
+  static updateOrganization(organizationId: string, organization: ApiOrganization, user: User): Promise<void> {
+    let url = `${Http.baseUrl()}/client-accounts/${organizationId}`;
     return Http.patch(url, user, organization);
   }
 
@@ -44,4 +43,4 @@ export default class OrganizationApi {
   }
 }
 
-makeErrorsPretty(OrganizationApi);
+makeErrorsPretty(OrganizationApi);

package/source/api/pipeline_api.ts

@@ -1,13 +1,13 @@
-import {AssociationIds} from "../models";
+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 { User } from "../utilities/get_authorization_headers";
+import ApiPipeline, { ApiPipelineArgument } from "../models/api/api_pipeline";
 
 export default class PipelineApi {
   static triggerJobStepsPipeline(associationIds: AssociationIds, body = {}, user: User): Promise<ApiPipeline> {
-    let {accountId, projectId, floorId, scanDatasetId} = associationIds;
-    const url = `${Http.baseUrl()}/pipeline/${accountId}/${projectId}/${floorId}/${scanDatasetId}/trigger`;
+    const {organizationId, projectId, floorId, scanDatasetId} = associationIds;
+    const url = `${Http.baseUrl()}/pipeline/${organizationId}/${projectId}/${floorId}/${scanDatasetId}/trigger`;
     return Http.post(url, user, body) as unknown as Promise<ApiPipeline>;
   }
 

package/source/api/project_api.ts

@@ -5,8 +5,8 @@ import makeErrorsPretty from "../utilities/make_errors_pretty";
 import { ApiCloudFile, ApiProject, ApiProjectCostAnalysisProgress, ApiProjectListing, ApiProjectMasterformatProgress, ApiWorkPackage, AssociationIds } from "../models";
 
 export default class ProjectApi {
-  static listProjectsForOrganization(accountId: string, user: User): Promise<ApiProject[]> {
-    let url = `${Http.baseUrl()}/client-accounts/${accountId}/projects`;
+  static listProjectsForOrganization(organizationId: string, user: User): Promise<ApiProject[]> {
+    let url = `${Http.baseUrl()}/client-accounts/${organizationId}/projects`;
     return Http.get(url, user) as unknown as Promise<ApiProject[]>;
   }
 
@@ -33,8 +33,8 @@ export default class ProjectApi {
     return Http.get(url, user) as unknown as Promise<ApiProject>;
   }
 
-  static createProject(accountId: string, project: ApiProject, user: User): Promise<{ firebaseId: string }> {
-    let url = `${Http.baseUrl()}/client-accounts/${accountId}/projects`;
+  static createProject(organizationId: string, project: ApiProject, user: User): Promise<{ firebaseId: string }> {
+    let url = `${Http.baseUrl()}/client-accounts/${organizationId}/projects`;
     return Http.post(url, user, project) as unknown as Promise<{ firebaseId: string }>;
   }
 
@@ -43,11 +43,16 @@ export default class ProjectApi {
     return Http.patch(url, user, project) as unknown as Promise<void>;
   }
 
-  static archiveProject(accountId: string, projectId: string, user: User): Promise<void> {
+  static archiveProject(projectId: string, user: User): Promise<void> {
     let url = `${Http.baseUrl()}/projects/${projectId}/archive`;
     return Http.post(url, user, null) as unknown as Promise<void>;
   }
 
+  static unarchiveProject(projectId: string, user: User): Promise<void> {
+    let url = `${Http.baseUrl()}/projects/${projectId}/unarchive`;
+    return Http.post(url, user, null) as unknown as Promise<void>;
+  }
+
   static saveProjectCostAnalysisProgress({ projectId }: AssociationIds, progress, user: User): Promise<void> {
     const url = `${Http.baseUrl()}/projects/${projectId}/cost-analysis-progress`;
     return Http.post(url, user, progress) as unknown as Promise<void>;
@@ -56,7 +61,7 @@ export default class ProjectApi {
   static saveScannedProjectMasterformatProgress({ projectId }: AssociationIds,
                                                 progress: ApiProjectMasterformatProgress,
                                                 user: User): Promise<void> {
-    const url = `${Http.baseUrl()}/projects/${projectId}/masterformat-progress`;
+    const url = `${Http.baseUrl()}/projects/${projectId}/scanned-masterformat-progress`;
     return Http.post(url, user, progress) as unknown as Promise<void>;
   }
 
@@ -77,7 +82,7 @@ export default class ProjectApi {
 
   static getScannedProjectMasterformatProgress({ projectId }: AssociationIds,
                                                user: User): Promise<ApiProjectMasterformatProgress[]> {
-    let url = `${Http.baseUrl()}/projects/${projectId}/masterformat-progress`;
+    let url = `${Http.baseUrl()}/projects/${projectId}/scanned-masterformat-progress`;
     return Http.get(url, user) as unknown as Promise<ApiProjectMasterformatProgress[]>;
   }
 

package/source/models/api/type_aliases.ts

@@ -1,11 +1,10 @@
-import {Matrix3, Matrix4, Quaternion} from "three";
-import {Moment} from "moment";
+import { Matrix3, Matrix4, Quaternion } from "three";
+import { Moment } from "moment";
 import ApiMatrix3 from "./api_matrix_3";
 import ApiMatrix4 from "./api_matrix_4";
-import {ApiQuaternion} from "./api_quaternion";
+import { ApiQuaternion } from "./api_quaternion";
 
 export type AssociationIds = {
-  accountId?: string,
   commentThreadId?: number,
   commentId?: number,
   organizationId?: string,

package/source/typings/type_aliases/index.d.ts

@@ -1,26 +1,16 @@
-import firebase from "firebase";
-import {Action} from "redux";
-import {Matrix3, Matrix4} from "three";
-import {Moment} from "moment";
-import {ThunkAction, ThunkDispatch} from "redux-thunk";
-import {Action as RoutingAction, Meta, Query} from "redux-first-router";
+import { Action } from "redux";
+import { Matrix3, Matrix4 } from "three";
+import { Moment } from "moment";
+import { Action as RoutingAction, Meta, Query } from "redux-first-router";
 
 import ApiCloudFile from "../../models/api/api_cloud_file";
 import ApiMatrix4 from "../../models/api/api_matrix_4";
-import CloudFile from "../../models/domain/cloud_file";
-import ResponseError from "../../models/response_error";
-import CustomError from "../../models/custom_error";
-import {PurposeType} from "../../models/domain/enums/purpose_type";
-import {OutputParametricSelector} from "reselect";
-import {ReduxStore} from "../../services/reducers/root_reducer";
-import {SinonSpy, SinonStub} from "sinon";
+import { PurposeType } from "../../models/domain/enums/purpose_type";
 import ApiMatrix3 from "../../models/api/api_matrix_3";
 
 declare type DeepPartial<T> = T extends object ? { [P in keyof T]?: DeepPartial<T[P]>; } : T;
 declare type Modify<T, R> = Omit<T, keyof R> & R
 declare type ModifyPartial<T, R> = Partial<Omit<T, keyof R> & R>
-declare type Stubbed<T> = { [Key in keyof T]: T[Key] extends Function ? SinonStub : T[Key] }
-declare type Spied<T> = { [Key in keyof T]: T[Key] extends Function ? SinonSpy : T[Key] }
 
 declare type DateLike = Moment | Date | number | string | null;
 declare type Vector2Like = { x: number, y: number };
@@ -28,7 +18,6 @@ declare type Vector3Like = { x: number, y: number, z: number };
 declare type Vector4Like = { a: number, b: number, c: number, d: number };
 declare type Matrix3Like = ApiMatrix3 | Matrix3 | null
 declare type Matrix4Like = ApiMatrix4 | Matrix4 | null
-declare type ErrorLike = Error | ResponseError | { message: string }
 
 declare interface FileLike extends Partial<File> {
   path?: string,
@@ -46,17 +35,7 @@ declare interface FileLike extends Partial<File> {
 //   declare type Element = { projectId?: string, floorId?: string, scanDatasetId?: string, globalId: string }
 // }
 
-declare interface EventWithTarget<Target extends EventTarget = EventTarget> extends Event {
-  target: Target
-  currentTarget: Target
-}
-
-declare interface AvvirThunkAction<Return, State, Actions extends Action> extends ThunkAction<Return, State, unknown, Actions> {
-  (dispatch: ThunkDispatch<State, unknown, Actions>, getState?: () => State): Return
-}
-
 declare type AssociationIds = {
-  accountId?: string,
   commentThreadId?: number,
   commentId?: number,
   organizationId?: string,
@@ -72,16 +51,8 @@ declare type AssociationIds = {
   wbsCode?: string
 };
 
-declare type FirebaseUploadTask = firebase.storage.UploadTask
-declare type FirebaseRef = firebase.storage.Reference
-declare type ByFirebaseId<Model> = { [firebaseId: string]: Model }
-declare type ByDatabaseId<Model> = { [id: number]: Model }
-
-declare type AvvirFiles<Type extends PurposeType = PurposeType> = { [purposeType in Type]?: CloudFile[] }
 declare type AvvirApiFiles<Type extends PurposeType = PurposeType> = { [purposeType in Type]?: ApiCloudFile | ApiCloudFile[] }
 
-export type Dispatch<Event> = ThunkDispatch<ReduxStore, unknown, Event>;
-
 declare interface AvvirEvent<Type extends string, Payload> extends Action<Type> {
   payload: Payload
 }
@@ -92,18 +63,3 @@ declare interface AvvirPayloadlessRoutingEvent<Type extends string> extends Rout
   query?: Query
   navKey?: string | null
 }
-
-declare interface AvvirRoutingEvent<Type extends string, Payload> extends AvvirPayloadlessRoutingEvent<Type> {
-  payload: {
-    query?: Query
-  } & Payload
-}
-
-declare type AvvirErrorEvent<Type extends string, Err extends ErrorLike = ErrorLike> = AvvirEvent<Type, { error: Err }>
-declare type EventCreator<Type extends string, Payload> = (...args) => AvvirEvent<Type, Payload>
-
-declare type AvvirSelector<Return, InputSelectorReturns, Props = unknown> = OutputParametricSelector<ReduxStore, Props, Return, (...args: InputSelectorReturns) => Return>
-
-declare interface Constructor<Clazz, Args> {
-  new(...args: Args): Clazz
-}