avvir 0.3.34 → 0.3.36
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.
- package/dist/avvir_api.node.js +33 -10
- package/dist/esm/api/scan_dataset_api.d.ts +2 -1
- package/dist/esm/api/scan_dataset_api.js +5 -1
- package/dist/esm/api/scan_dataset_api.js.map +1 -1
- package/dist/esm/api/web_rpc_api.d.ts +3 -1
- package/dist/esm/api/web_rpc_api.js +18 -3
- package/dist/esm/api/web_rpc_api.js.map +1 -1
- package/dist/esm/models/api/api_user_for_organization.d.ts +3 -1
- package/dist/esm/models/api/api_user_for_organization.js +3 -1
- package/dist/esm/models/api/api_user_for_organization.js.map +1 -1
- package/package.json +1 -1
- package/source/api/scan_dataset_api.ts +10 -1
- package/source/api/web_rpc_api.ts +18 -6
- package/source/models/api/api_user_for_organization.ts +5 -1
package/dist/avvir_api.node.js
CHANGED
|
@@ -969,11 +969,16 @@ var ScanDatasetApi = /** @class */ (function () {
|
|
|
969
969
|
var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/projects/" + projectId + "/floors/" + floorId + "/scan-datasets";
|
|
970
970
|
return _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].get(url, user);
|
|
971
971
|
};
|
|
972
|
-
ScanDatasetApi.
|
|
972
|
+
ScanDatasetApi.mergeScanDataset = function (_a, scanDataset, user) {
|
|
973
973
|
var projectId = _a.projectId, floorId = _a.floorId, scanDatasetId = _a.scanDatasetId;
|
|
974
974
|
var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/projects/" + projectId + "/floors/" + floorId + "/scan-datasets/" + scanDatasetId;
|
|
975
975
|
return _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].patch(url, user, scanDataset);
|
|
976
976
|
};
|
|
977
|
+
ScanDatasetApi.replaceScanDataset = function (_a, scanDataset, user) {
|
|
978
|
+
var projectId = _a.projectId, floorId = _a.floorId, scanDatasetId = _a.scanDatasetId;
|
|
979
|
+
var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/projects/" + projectId + "/floors/" + floorId + "/scan-datasets/" + scanDatasetId;
|
|
980
|
+
return _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].put(url, user, scanDataset);
|
|
981
|
+
};
|
|
977
982
|
ScanDatasetApi.createScanDataset = function (_a, user) {
|
|
978
983
|
var projectId = _a.projectId, floorId = _a.floorId, scanDate = _a.scanDate;
|
|
979
984
|
var url = _utilities_http__WEBPACK_IMPORTED_MODULE_0__["default"].baseUrl() + "/projects/" + projectId + "/floors/" + floorId + "/scan-datasets";
|
|
@@ -1356,8 +1361,10 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
1356
1361
|
/* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__)
|
|
1357
1362
|
/* harmony export */ });
|
|
1358
1363
|
/* harmony import */ var _models__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8195);
|
|
1359
|
-
/* harmony import */ var
|
|
1360
|
-
/* harmony import */ var
|
|
1364
|
+
/* harmony import */ var _models_api_api_rpc_query_response__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9453);
|
|
1365
|
+
/* harmony import */ var _utilities_make_errors_pretty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(6289);
|
|
1366
|
+
/* harmony import */ var _utilities_http__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(5562);
|
|
1367
|
+
|
|
1361
1368
|
|
|
1362
1369
|
|
|
1363
1370
|
|
|
@@ -1377,7 +1384,7 @@ var HttpRpcExchangeClient = /** @class */ (function () {
|
|
|
1377
1384
|
return "http://localhost:8000";
|
|
1378
1385
|
}
|
|
1379
1386
|
else {
|
|
1380
|
-
return
|
|
1387
|
+
return _utilities_http__WEBPACK_IMPORTED_MODULE_3__["default"].baseUrl();
|
|
1381
1388
|
}
|
|
1382
1389
|
};
|
|
1383
1390
|
HttpRpcExchangeClient.prototype.sleep = function (ms) {
|
|
@@ -1385,7 +1392,7 @@ var HttpRpcExchangeClient = /** @class */ (function () {
|
|
|
1385
1392
|
};
|
|
1386
1393
|
HttpRpcExchangeClient.prototype.post = function (route, user, response) {
|
|
1387
1394
|
var url = "" + this.baseUrl() + route;
|
|
1388
|
-
return
|
|
1395
|
+
return _utilities_http__WEBPACK_IMPORTED_MODULE_3__["default"].post(url, user, response).then(function (response) {
|
|
1389
1396
|
return response.json().then(function (json) {
|
|
1390
1397
|
return json;
|
|
1391
1398
|
});
|
|
@@ -1427,17 +1434,31 @@ var HttpRpcExchangeClient = /** @class */ (function () {
|
|
|
1427
1434
|
var WebRpcApi = /** @class */ (function () {
|
|
1428
1435
|
function WebRpcApi() {
|
|
1429
1436
|
this.httpRpcExchangeClient = new HttpRpcExchangeClient();
|
|
1437
|
+
this.stubCalls = true;
|
|
1430
1438
|
}
|
|
1431
|
-
WebRpcApi.prototype.startRpcSession = function (user) {
|
|
1432
|
-
|
|
1439
|
+
WebRpcApi.prototype.startRpcSession = function (session, user) {
|
|
1440
|
+
if (this.stubCalls) {
|
|
1441
|
+
return new Promise(function (resolve) { return resolve(new _models__WEBPACK_IMPORTED_MODULE_0__.ApiRpcSession({ sessionId: -1 })); });
|
|
1442
|
+
}
|
|
1443
|
+
else {
|
|
1444
|
+
return this.httpRpcExchangeClient.startSession(session, user);
|
|
1445
|
+
}
|
|
1433
1446
|
};
|
|
1434
1447
|
WebRpcApi.prototype.runRpcQuery = function (request, user) {
|
|
1435
|
-
|
|
1448
|
+
if (this.stubCalls) {
|
|
1449
|
+
return new Promise(function (resolve) { return resolve(new _models_api_api_rpc_query_response__WEBPACK_IMPORTED_MODULE_1__["default"]({ queryId: -1, statusCode: 2, message: "fake response", result: { photoUrl: "https://storage.googleapis.com/avvir-portal-acceptance.appspot.com/hackathon2023/j9tsglzc1xksmx1lxl78.jpg?Expires=253370764800&GoogleAccessId=firebase-adminsdk-buats%40avvir-portal-acceptance.iam.gserviceaccount.com&Signature=r5zxE8EJhjt%2BwNALhoOq0Iu7OaepcLo6RApylsRxoeNd%2BtAhNIR8Dh%2BiDTGBms3JhjmKm7ykdOhlGamorgf57%2Fd9RHPMp%2BqBq2i0xRyskC4bD4msSATAW285qzXg6CCkocLC6jruSpSGgdZgEmMW9Jo%2FzwYa%2BovoRj8d5CXVO1A5nEgxysdpje%2F4fqVUFI9uZoR%2B%2FTg9oJlybsPKZjhGk7FnS4UlBuWnRz8nai3Ln2zwqp%2BDaecCMGvwF3R%2FXd5UNQm8J1neYVZsTKj4q%2FImdaCb%2BNxcmP11omoAAz8AzCeG3SYaFVjn9ZaWZwCeDsCV6v413sEuB3QjHp9QEFvT1A%3D%3D" } })); });
|
|
1450
|
+
}
|
|
1451
|
+
else {
|
|
1452
|
+
return this.httpRpcExchangeClient.runQuery(request, user);
|
|
1453
|
+
}
|
|
1454
|
+
};
|
|
1455
|
+
WebRpcApi.printHello = function () {
|
|
1456
|
+
console.log("hello");
|
|
1436
1457
|
};
|
|
1437
1458
|
return WebRpcApi;
|
|
1438
1459
|
}());
|
|
1439
1460
|
/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (WebRpcApi);
|
|
1440
|
-
(0,
|
|
1461
|
+
(0,_utilities_make_errors_pretty__WEBPACK_IMPORTED_MODULE_2__["default"])(WebRpcApi, {
|
|
1441
1462
|
exclude: [],
|
|
1442
1463
|
overrideErrorMessage: [],
|
|
1443
1464
|
});
|
|
@@ -4282,7 +4303,7 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
4282
4303
|
/* harmony export */ });
|
|
4283
4304
|
var ApiUserForOrganization = /** @class */ (function () {
|
|
4284
4305
|
function ApiUserForOrganization(_a) {
|
|
4285
|
-
var _b = _a === void 0 ? {} : _a, id = _b.id, name = _b.name, email = _b.email, role = _b.role, projects = _b.projects, accessType = _b.accessType, inviteStatus = _b.inviteStatus, masterformatCodes = _b.masterformatCodes, latestInvitationExpiry = _b.latestInvitationExpiry;
|
|
4306
|
+
var _b = _a === void 0 ? {} : _a, id = _b.id, name = _b.name, email = _b.email, role = _b.role, projects = _b.projects, accessType = _b.accessType, inviteStatus = _b.inviteStatus, masterformatCodes = _b.masterformatCodes, latestInvitationExpiry = _b.latestInvitationExpiry, accountCreationTime = _b.accountCreationTime, accountAcceptedTime = _b.accountAcceptedTime;
|
|
4286
4307
|
this.id = id;
|
|
4287
4308
|
this.name = name;
|
|
4288
4309
|
this.email = email;
|
|
@@ -4292,6 +4313,8 @@ var ApiUserForOrganization = /** @class */ (function () {
|
|
|
4292
4313
|
this.inviteStatus = inviteStatus;
|
|
4293
4314
|
this.masterformatCodes = masterformatCodes;
|
|
4294
4315
|
this.latestInvitationExpiry = latestInvitationExpiry;
|
|
4316
|
+
this.accountCreationTime = accountCreationTime;
|
|
4317
|
+
this.accountAcceptedTime = accountAcceptedTime;
|
|
4295
4318
|
}
|
|
4296
4319
|
return ApiUserForOrganization;
|
|
4297
4320
|
}());
|
|
@@ -5,7 +5,8 @@ import ApiView, { ViewParameter } from "../models/api/api_view";
|
|
|
5
5
|
import { ApiScanDataset, ApiDetailedElement, ApiPhotoSession, ApiBuiltStatus, ApiScannedElementType } from "../models";
|
|
6
6
|
export default class ScanDatasetApi {
|
|
7
7
|
static listScanDatasetsForFloor({ projectId, floorId }: AssociationIds, user: User): Promise<ApiScanDataset[]>;
|
|
8
|
-
static
|
|
8
|
+
static mergeScanDataset({ projectId, floorId, scanDatasetId }: AssociationIds, scanDataset: ApiScanDataset, user: User): Promise<void>;
|
|
9
|
+
static replaceScanDataset({ projectId, floorId, scanDatasetId }: AssociationIds, scanDataset: ApiScanDataset, user: User): Promise<void>;
|
|
9
10
|
static createScanDataset({ projectId, floorId, scanDate }: AssociationIds & {
|
|
10
11
|
scanDate?: DateLike;
|
|
11
12
|
}, user: User): Promise<ApiScanDataset>;
|
|
@@ -6,10 +6,14 @@ export default class ScanDatasetApi {
|
|
|
6
6
|
let url = `${Http.baseUrl()}/projects/${projectId}/floors/${floorId}/scan-datasets`;
|
|
7
7
|
return Http.get(url, user);
|
|
8
8
|
}
|
|
9
|
-
static
|
|
9
|
+
static mergeScanDataset({ projectId, floorId, scanDatasetId }, scanDataset, user) {
|
|
10
10
|
const url = `${Http.baseUrl()}/projects/${projectId}/floors/${floorId}/scan-datasets/${scanDatasetId}`;
|
|
11
11
|
return Http.patch(url, user, scanDataset);
|
|
12
12
|
}
|
|
13
|
+
static replaceScanDataset({ projectId, floorId, scanDatasetId }, scanDataset, user) {
|
|
14
|
+
const url = `${Http.baseUrl()}/projects/${projectId}/floors/${floorId}/scan-datasets/${scanDatasetId}`;
|
|
15
|
+
return Http.put(url, user, scanDataset);
|
|
16
|
+
}
|
|
13
17
|
static createScanDataset({ projectId, floorId, scanDate }, user) {
|
|
14
18
|
let url = `${Http.baseUrl()}/projects/${projectId}/floors/${floorId}/scan-datasets`;
|
|
15
19
|
if (scanDate) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scan_dataset_api.js","sourceRoot":"","sources":["../../../source/api/scan_dataset_api.ts"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,mBAAmB,CAAC;AACrC,OAAO,gBAAgB,MAAM,iCAAiC,CAAC;AAG/D,OAAO,EAAC,aAAa,EAAC,MAAM,eAAe,CAAC;AAG5C,MAAM,CAAC,OAAO,OAAO,cAAc;IACjC,MAAM,CAAC,wBAAwB,CAAC,EAAC,SAAS,EAAE,OAAO,EAAiB,EAAE,IAAU;QAC9E,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,SAAS,WAAW,OAAO,gBAAgB,CAAC;QACpF,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAyC,CAAC;IACrE,CAAC;IAED,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"scan_dataset_api.js","sourceRoot":"","sources":["../../../source/api/scan_dataset_api.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,9 @@ declare class HttpRpcExchangeClient {
|
|
|
24
24
|
}
|
|
25
25
|
export default class WebRpcApi {
|
|
26
26
|
httpRpcExchangeClient: HttpRpcExchangeClient;
|
|
27
|
-
|
|
27
|
+
stubCalls: boolean;
|
|
28
|
+
startRpcSession(session: ApiRpcSession, user: User): Promise<ApiRpcSession>;
|
|
28
29
|
runRpcQuery(request: ApiRpcQueryRequest, user: User): Promise<ApiRpcQueryResponse>;
|
|
30
|
+
static printHello(): void;
|
|
29
31
|
}
|
|
30
32
|
export {};
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { ApiRpcSession } from "../models";
|
|
2
|
+
import ApiRpcQueryResponse from "../models/api/api_rpc_query_response";
|
|
2
3
|
import makeErrorsPretty from "../utilities/make_errors_pretty";
|
|
3
4
|
import Http from "../utilities/http";
|
|
4
5
|
export var ApiQueryStatus;
|
|
@@ -64,12 +65,26 @@ class HttpRpcExchangeClient {
|
|
|
64
65
|
export default class WebRpcApi {
|
|
65
66
|
constructor() {
|
|
66
67
|
this.httpRpcExchangeClient = new HttpRpcExchangeClient();
|
|
68
|
+
this.stubCalls = true;
|
|
67
69
|
}
|
|
68
|
-
startRpcSession(user) {
|
|
69
|
-
|
|
70
|
+
startRpcSession(session, user) {
|
|
71
|
+
if (this.stubCalls) {
|
|
72
|
+
return new Promise((resolve) => resolve(new ApiRpcSession({ sessionId: -1 })));
|
|
73
|
+
}
|
|
74
|
+
else {
|
|
75
|
+
return this.httpRpcExchangeClient.startSession(session, user);
|
|
76
|
+
}
|
|
70
77
|
}
|
|
71
78
|
runRpcQuery(request, user) {
|
|
72
|
-
|
|
79
|
+
if (this.stubCalls) {
|
|
80
|
+
return new Promise((resolve) => resolve(new ApiRpcQueryResponse({ queryId: -1, statusCode: 2, message: "fake response", result: { photoUrl: "https://storage.googleapis.com/avvir-portal-acceptance.appspot.com/hackathon2023/j9tsglzc1xksmx1lxl78.jpg?Expires=253370764800&GoogleAccessId=firebase-adminsdk-buats%40avvir-portal-acceptance.iam.gserviceaccount.com&Signature=r5zxE8EJhjt%2BwNALhoOq0Iu7OaepcLo6RApylsRxoeNd%2BtAhNIR8Dh%2BiDTGBms3JhjmKm7ykdOhlGamorgf57%2Fd9RHPMp%2BqBq2i0xRyskC4bD4msSATAW285qzXg6CCkocLC6jruSpSGgdZgEmMW9Jo%2FzwYa%2BovoRj8d5CXVO1A5nEgxysdpje%2F4fqVUFI9uZoR%2B%2FTg9oJlybsPKZjhGk7FnS4UlBuWnRz8nai3Ln2zwqp%2BDaecCMGvwF3R%2FXd5UNQm8J1neYVZsTKj4q%2FImdaCb%2BNxcmP11omoAAz8AzCeG3SYaFVjn9ZaWZwCeDsCV6v413sEuB3QjHp9QEFvT1A%3D%3D" } })));
|
|
81
|
+
}
|
|
82
|
+
else {
|
|
83
|
+
return this.httpRpcExchangeClient.runQuery(request, user);
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
static printHello() {
|
|
87
|
+
console.log("hello");
|
|
73
88
|
}
|
|
74
89
|
}
|
|
75
90
|
makeErrorsPretty(WebRpcApi, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web_rpc_api.js","sourceRoot":"","sources":["../../../source/api/web_rpc_api.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,aAAa,EAAC,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"web_rpc_api.js","sourceRoot":"","sources":["../../../source/api/web_rpc_api.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,8 @@ export declare class ApiUserForOrganization {
|
|
|
10
10
|
inviteStatus: string;
|
|
11
11
|
masterformatCodes: string[];
|
|
12
12
|
latestInvitationExpiry: DateLike;
|
|
13
|
-
|
|
13
|
+
accountCreationTime: DateLike;
|
|
14
|
+
accountAcceptedTime: DateLike;
|
|
15
|
+
constructor({ id, name, email, role, projects, accessType, inviteStatus, masterformatCodes, latestInvitationExpiry, accountCreationTime, accountAcceptedTime }?: Partial<ApiUserForOrganization>);
|
|
14
16
|
}
|
|
15
17
|
export default ApiUserForOrganization;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export class ApiUserForOrganization {
|
|
2
|
-
constructor({ id, name, email, role, projects, accessType, inviteStatus, masterformatCodes, latestInvitationExpiry } = {}) {
|
|
2
|
+
constructor({ id, name, email, role, projects, accessType, inviteStatus, masterformatCodes, latestInvitationExpiry, accountCreationTime, accountAcceptedTime } = {}) {
|
|
3
3
|
this.id = id;
|
|
4
4
|
this.name = name;
|
|
5
5
|
this.email = email;
|
|
@@ -9,6 +9,8 @@ export class ApiUserForOrganization {
|
|
|
9
9
|
this.inviteStatus = inviteStatus;
|
|
10
10
|
this.masterformatCodes = masterformatCodes;
|
|
11
11
|
this.latestInvitationExpiry = latestInvitationExpiry;
|
|
12
|
+
this.accountCreationTime = accountCreationTime;
|
|
13
|
+
this.accountAcceptedTime = accountAcceptedTime;
|
|
12
14
|
}
|
|
13
15
|
}
|
|
14
16
|
export default ApiUserForOrganization;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api_user_for_organization.js","sourceRoot":"","sources":["../../../../source/models/api/api_user_for_organization.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,sBAAsB;
|
|
1
|
+
{"version":3,"file":"api_user_for_organization.js","sourceRoot":"","sources":["../../../../source/models/api/api_user_for_organization.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,sBAAsB;IAa/B,YAAY,EAAC,EAAE,EAAE,IAAI,EAAG,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,mBAAmB,KAAqC,EAAE;QAC/L,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;QACrD,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;QAC/C,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;IACnD,CAAC;CACJ;AAED,eAAe,sBAAsB,CAAC"}
|
package/package.json
CHANGED
|
@@ -13,7 +13,7 @@ export default class ScanDatasetApi {
|
|
|
13
13
|
return Http.get(url, user) as unknown as Promise<ApiScanDataset[]>;
|
|
14
14
|
}
|
|
15
15
|
|
|
16
|
-
static
|
|
16
|
+
static mergeScanDataset({
|
|
17
17
|
projectId,
|
|
18
18
|
floorId,
|
|
19
19
|
scanDatasetId
|
|
@@ -22,6 +22,15 @@ export default class ScanDatasetApi {
|
|
|
22
22
|
return Http.patch(url, user, scanDataset) as unknown as Promise<void>;
|
|
23
23
|
}
|
|
24
24
|
|
|
25
|
+
static replaceScanDataset({
|
|
26
|
+
projectId,
|
|
27
|
+
floorId,
|
|
28
|
+
scanDatasetId
|
|
29
|
+
}: AssociationIds, scanDataset: ApiScanDataset, user: User): Promise<void> {
|
|
30
|
+
const url = `${Http.baseUrl()}/projects/${projectId}/floors/${floorId}/scan-datasets/${scanDatasetId}`;
|
|
31
|
+
return Http.put(url, user, scanDataset) as unknown as Promise<void>;
|
|
32
|
+
}
|
|
33
|
+
|
|
25
34
|
static createScanDataset({
|
|
26
35
|
projectId,
|
|
27
36
|
floorId,
|
|
@@ -57,10 +57,9 @@ class HttpRpcExchangeClient {
|
|
|
57
57
|
getQueryResponse(exchangeRequest: ApiRpcExchangeRequest, user: User): Promise<ApiRpcQueryResponse> {
|
|
58
58
|
const resultPromise = this.post("/rpc/get_query_response", user, exchangeRequest) as unknown as Promise<ApiRpcQueryResponse>
|
|
59
59
|
return resultPromise.then(result => {
|
|
60
|
-
if(result.statusCode != ApiQueryStatus.RUNNING)
|
|
61
|
-
{
|
|
60
|
+
if (result.statusCode != ApiQueryStatus.RUNNING) {
|
|
62
61
|
return result
|
|
63
|
-
}else {
|
|
62
|
+
} else {
|
|
64
63
|
return this.sleep(1000).then(() => { return this.getQueryResponse(exchangeRequest, user) })
|
|
65
64
|
}
|
|
66
65
|
})
|
|
@@ -78,12 +77,25 @@ class HttpRpcExchangeClient {
|
|
|
78
77
|
|
|
79
78
|
export default class WebRpcApi {
|
|
80
79
|
httpRpcExchangeClient = new HttpRpcExchangeClient();
|
|
81
|
-
|
|
82
|
-
|
|
80
|
+
stubCalls = true;
|
|
81
|
+
startRpcSession(session: ApiRpcSession, user: User): Promise<ApiRpcSession> {
|
|
82
|
+
if (this.stubCalls) {
|
|
83
|
+
return new Promise((resolve) => resolve(new ApiRpcSession({sessionId: -1})));
|
|
84
|
+
} else {
|
|
85
|
+
return this.httpRpcExchangeClient.startSession(session, user);
|
|
86
|
+
}
|
|
83
87
|
}
|
|
84
88
|
|
|
85
89
|
runRpcQuery(request: ApiRpcQueryRequest, user: User): Promise<ApiRpcQueryResponse> {
|
|
86
|
-
|
|
90
|
+
if (this.stubCalls) {
|
|
91
|
+
return new Promise((resolve) => resolve(new ApiRpcQueryResponse({queryId: -1, statusCode: 2, message: "fake response", result: {photoUrl: "https://storage.googleapis.com/avvir-portal-acceptance.appspot.com/hackathon2023/j9tsglzc1xksmx1lxl78.jpg?Expires=253370764800&GoogleAccessId=firebase-adminsdk-buats%40avvir-portal-acceptance.iam.gserviceaccount.com&Signature=r5zxE8EJhjt%2BwNALhoOq0Iu7OaepcLo6RApylsRxoeNd%2BtAhNIR8Dh%2BiDTGBms3JhjmKm7ykdOhlGamorgf57%2Fd9RHPMp%2BqBq2i0xRyskC4bD4msSATAW285qzXg6CCkocLC6jruSpSGgdZgEmMW9Jo%2FzwYa%2BovoRj8d5CXVO1A5nEgxysdpje%2F4fqVUFI9uZoR%2B%2FTg9oJlybsPKZjhGk7FnS4UlBuWnRz8nai3Ln2zwqp%2BDaecCMGvwF3R%2FXd5UNQm8J1neYVZsTKj4q%2FImdaCb%2BNxcmP11omoAAz8AzCeG3SYaFVjn9ZaWZwCeDsCV6v413sEuB3QjHp9QEFvT1A%3D%3D"}})))
|
|
92
|
+
} else {
|
|
93
|
+
return this.httpRpcExchangeClient.runQuery(request, user);
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
static printHello() {
|
|
98
|
+
console.log("hello");
|
|
87
99
|
}
|
|
88
100
|
}
|
|
89
101
|
|
|
@@ -11,8 +11,10 @@ export class ApiUserForOrganization {
|
|
|
11
11
|
inviteStatus: string
|
|
12
12
|
masterformatCodes: string[]
|
|
13
13
|
latestInvitationExpiry: DateLike
|
|
14
|
+
accountCreationTime: DateLike
|
|
15
|
+
accountAcceptedTime: DateLike
|
|
14
16
|
|
|
15
|
-
constructor({id, name, email, role, projects, accessType, inviteStatus, masterformatCodes, latestInvitationExpiry}: Partial<ApiUserForOrganization> = {}) {
|
|
17
|
+
constructor({id, name, email, role, projects, accessType, inviteStatus, masterformatCodes, latestInvitationExpiry, accountCreationTime, accountAcceptedTime}: Partial<ApiUserForOrganization> = {}) {
|
|
16
18
|
this.id = id;
|
|
17
19
|
this.name = name;
|
|
18
20
|
this.email = email;
|
|
@@ -22,6 +24,8 @@ export class ApiUserForOrganization {
|
|
|
22
24
|
this.inviteStatus = inviteStatus;
|
|
23
25
|
this.masterformatCodes = masterformatCodes;
|
|
24
26
|
this.latestInvitationExpiry = latestInvitationExpiry;
|
|
27
|
+
this.accountCreationTime = accountCreationTime;
|
|
28
|
+
this.accountAcceptedTime = accountAcceptedTime;
|
|
25
29
|
}
|
|
26
30
|
}
|
|
27
31
|
|