@itwin/ecschema-rpcinterface-tests 3.0.0-dev.91 → 3.0.0-dev.92
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.
|
@@ -8,7 +8,7 @@ exports.IModelSession = void 0;
|
|
|
8
8
|
const chai_1 = require("chai");
|
|
9
9
|
const core_frontend_1 = require("@itwin/core-frontend");
|
|
10
10
|
const imodelhub_client_1 = require("@bentley/imodelhub-client");
|
|
11
|
-
const
|
|
11
|
+
const projects_client_1 = require("@itwin/projects-client");
|
|
12
12
|
class IModelSession {
|
|
13
13
|
constructor(iModelId, iTwinId, changesetId) {
|
|
14
14
|
this.iTwinId = iTwinId;
|
|
@@ -20,11 +20,11 @@ class IModelSession {
|
|
|
20
20
|
let imodelId;
|
|
21
21
|
// Turn the iTwin name into an id
|
|
22
22
|
if (iModelData.useITwinName && iModelData.iTwinName) {
|
|
23
|
-
const client = new
|
|
23
|
+
const client = new projects_client_1.ProjectsAccessClient();
|
|
24
24
|
const iTwinList = await client.getAll(requestContext, {
|
|
25
25
|
search: {
|
|
26
26
|
searchString: iModelData.iTwinName,
|
|
27
|
-
propertyName:
|
|
27
|
+
propertyName: projects_client_1.ProjectsSearchableProperty.Name,
|
|
28
28
|
exactMatch: true,
|
|
29
29
|
},
|
|
30
30
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IModelSession.js","sourceRoot":"","sources":["../../../src/frontend/setup/IModelSession.ts"],"names":[],"mappings":";;;AAAA;;;+FAG+F;AAC/F,+BAA8B;AAC9B,wDAA4D;AAC5D,gEAAyE;AACzE,
|
|
1
|
+
{"version":3,"file":"IModelSession.js","sourceRoot":"","sources":["../../../src/frontend/setup/IModelSession.ts"],"names":[],"mappings":";;;AAAA;;;+FAG+F;AAC/F,+BAA8B;AAC9B,wDAA4D;AAC5D,gEAAyE;AACzE,4DAA4G;AAI5G,MAAa,aAAa;IAQxB,YAAmB,QAAgB,EAAE,OAAe,EAAE,WAAoB;QACxE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,cAA2B,EAAE,UAAsB;QAC5E,IAAI,SAAS,CAAC;QACd,IAAI,QAAQ,CAAC;QAEb,iCAAiC;QACjC,IAAI,UAAU,CAAC,YAAY,IAAI,UAAU,CAAC,SAAS,EAAE;YACnD,MAAM,MAAM,GAAG,IAAI,sCAAoB,EAAE,CAAC;YAC1C,MAAM,SAAS,GAAY,MAAM,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE;gBAC7D,MAAM,EAAE;oBACN,YAAY,EAAE,UAAU,CAAC,SAAS;oBAClC,YAAY,EAAE,4CAA0B,CAAC,IAAI;oBAC7C,UAAU,EAAE,IAAI;iBACjB;aACF,CAAC,CAAC;YAEH,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;gBACxB,MAAM,IAAI,KAAK,CAAC,SAAS,UAAU,CAAC,SAAS,8BAA8B,CAAC,CAAC;iBAC1E,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC;gBAC3B,MAAM,IAAI,KAAK,CAAC,yBAAyB,UAAU,CAAC,SAAS,2BAA2B,CAAC,CAAC;YAE5F,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SAC7B;;YACC,SAAS,GAAG,UAAU,CAAC,OAAQ,CAAC;QAElC,IAAI,UAAU,CAAC,OAAO,EAAE;YACtB,MAAM,YAAY,GAAG,IAAI,kCAAe,EAAE,CAAC;YAC3C,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,SAAS,EAAE,IAAI,8BAAW,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,IAAK,CAAC,CAAC,CAAC;YACtH,IAAI,SAAS,KAAK,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;gBAC/C,MAAM,IAAI,KAAK,CAAC,cAAc,UAAU,CAAC,IAAI,8BAA8B,SAAS,GAAG,CAAC,CAAC;YAC3F,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;SAC7B;;YACC,QAAQ,GAAG,UAAU,CAAC,EAAG,CAAC;QAE5B,OAAO,CAAC,GAAG,CAAC,uBAAuB,UAAU,CAAC,IAAI,QAAQ,UAAU,CAAC,EAAE,eAAe,UAAU,CAAC,OAAO,iBAAiB,UAAU,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC,iCAAiC;QAEvL,OAAO,IAAI,aAAa,CAAC,SAAS,EAAE,QAAQ,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC;IACxE,CAAC;IAEM,KAAK,CAAC,aAAa;QACxB,OAAO,SAAS,KAAK,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;IACjE,CAAC;IAEM,KAAK,CAAC,IAAI;QACf,IAAI;YACF,sCAAsC;YACtC,OAAO,CAAC,GAAG,CAAC,gBAAgB,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC,CAAC;YAC3D,IAAI,CAAC,OAAO,GAAG,MAAM,oCAAoB,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAClF,IAAA,aAAM,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC;SAC/B;QAAC,OAAO,CAAM,EAAE;YACf,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;SACpE;QAED,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;CACF;AApED,sCAoEC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\nimport { expect } from \"chai\";\r\nimport { CheckpointConnection } from \"@itwin/core-frontend\";\r\nimport { IModelHubClient, IModelQuery } from \"@bentley/imodelhub-client\";\r\nimport { Project as ITwin, ProjectsAccessClient, ProjectsSearchableProperty } from \"@itwin/projects-client\";\r\nimport { IModelData } from \"../../common/Settings\";\r\nimport { AccessToken } from \"@itwin/core-bentley\";\r\n\r\nexport class IModelSession {\r\n\r\n public iTwinId: string;\r\n public iModelId: string;\r\n public changesetId?: string;\r\n\r\n private _iModel?: CheckpointConnection;\r\n\r\n public constructor(iModelId: string, iTwinId: string, changesetId?: string) {\r\n this.iTwinId = iTwinId;\r\n this.iModelId = iModelId;\r\n this.changesetId = changesetId;\r\n }\r\n\r\n public static async create(requestContext: AccessToken, iModelData: IModelData): Promise<IModelSession> {\r\n let contextId;\r\n let imodelId;\r\n\r\n // Turn the iTwin name into an id\r\n if (iModelData.useITwinName && iModelData.iTwinName) {\r\n const client = new ProjectsAccessClient();\r\n const iTwinList: ITwin[] = await client.getAll(requestContext, {\r\n search: {\r\n searchString: iModelData.iTwinName,\r\n propertyName: ProjectsSearchableProperty.Name,\r\n exactMatch: true,\r\n },\r\n });\r\n\r\n if (iTwinList.length === 0)\r\n throw new Error(`ITwin ${iModelData.iTwinName} was not found for the user.`);\r\n else if (iTwinList.length > 1)\r\n throw new Error(`Multiple iTwins named ${iModelData.iTwinName} were found for the user.`);\r\n\r\n contextId = iTwinList[0].id;\r\n } else\r\n contextId = iModelData.iTwinId!;\r\n\r\n if (iModelData.useName) {\r\n const imodelClient = new IModelHubClient();\r\n const imodels = await imodelClient.iModels.get(requestContext, contextId, new IModelQuery().byName(iModelData.name!));\r\n if (undefined === imodels || imodels.length === 0)\r\n throw new Error(`The iModel ${iModelData.name} does not exist in project ${contextId}.`);\r\n imodelId = imodels[0].wsgId;\r\n } else\r\n imodelId = iModelData.id!;\r\n\r\n console.log(`Using iModel { name:${iModelData.name}, id:${iModelData.id}, projectId:${iModelData.iTwinId}, changesetId:${iModelData.changesetId} }`); // eslint-disable-line no-console\r\n\r\n return new IModelSession(contextId, imodelId, iModelData.changesetId);\r\n }\r\n\r\n public async getConnection(): Promise<CheckpointConnection> {\r\n return undefined === this._iModel ? this.open() : this._iModel;\r\n }\r\n\r\n public async open(): Promise<CheckpointConnection> {\r\n try {\r\n // eslint-disable-next-line no-console\r\n console.log(`Environment: ${process.env.IMJS_URL_PREFIX}`);\r\n this._iModel = await CheckpointConnection.openRemote(this.iTwinId, this.iModelId);\r\n expect(this._iModel).to.exist;\r\n } catch (e: any) {\r\n throw new Error(`Failed to open test iModel. Error: ${e.message}`);\r\n }\r\n\r\n return this._iModel;\r\n }\r\n}\r\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@itwin/ecschema-rpcinterface-tests",
|
|
3
|
-
"version": "3.0.0-dev.
|
|
3
|
+
"version": "3.0.0-dev.92",
|
|
4
4
|
"description": "Integration tests for the Schema RPC Interface",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "Bentley Systems, Inc.",
|
|
@@ -11,21 +11,20 @@
|
|
|
11
11
|
"url": "https://github.com/imodeljs/imodeljs/tree/master/full-stack-tests/ecschema-rpc-interface"
|
|
12
12
|
},
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@itwin/core-bentley": "3.0.0-dev.
|
|
15
|
-
"@itwin/build-tools": "3.0.0-dev.
|
|
16
|
-
"@itwin/certa": "3.0.0-dev.
|
|
17
|
-
"@itwin/ecschema-metadata": "3.0.0-dev.
|
|
18
|
-
"@itwin/ecschema-rpcinterface-common": "3.0.0-dev.
|
|
19
|
-
"@itwin/core-geometry": "3.0.0-dev.
|
|
20
|
-
"@bentley/imodelhub-client": "3.0.0-dev.
|
|
21
|
-
"@itwin/core-common": "3.0.0-dev.
|
|
22
|
-
"@itwin/core-frontend": "3.0.0-dev.
|
|
23
|
-
"@itwin/core-
|
|
24
|
-
"@itwin
|
|
25
|
-
"@
|
|
26
|
-
"@itwin/
|
|
27
|
-
"@itwin/presentation-
|
|
28
|
-
"@itwin/presentation-frontend": "3.0.0-dev.91",
|
|
14
|
+
"@itwin/core-bentley": "3.0.0-dev.92",
|
|
15
|
+
"@itwin/build-tools": "3.0.0-dev.92",
|
|
16
|
+
"@itwin/certa": "3.0.0-dev.92",
|
|
17
|
+
"@itwin/ecschema-metadata": "3.0.0-dev.92",
|
|
18
|
+
"@itwin/ecschema-rpcinterface-common": "3.0.0-dev.92",
|
|
19
|
+
"@itwin/core-geometry": "3.0.0-dev.92",
|
|
20
|
+
"@bentley/imodelhub-client": "3.0.0-dev.92",
|
|
21
|
+
"@itwin/core-common": "3.0.0-dev.92",
|
|
22
|
+
"@itwin/core-frontend": "3.0.0-dev.92",
|
|
23
|
+
"@itwin/core-quantity": "3.0.0-dev.92",
|
|
24
|
+
"@bentley/itwin-client": "3.0.0-dev.92",
|
|
25
|
+
"@itwin/oidc-signin-tool": "3.0.0-dev.92",
|
|
26
|
+
"@itwin/presentation-common": "3.0.0-dev.92",
|
|
27
|
+
"@itwin/presentation-frontend": "3.0.0-dev.92",
|
|
29
28
|
"chai": "^4.1.2",
|
|
30
29
|
"chai-as-promised": "^7",
|
|
31
30
|
"dotenv": "^10.0.0",
|
|
@@ -35,10 +34,10 @@
|
|
|
35
34
|
"puppeteer": "chrome-86"
|
|
36
35
|
},
|
|
37
36
|
"devDependencies": {
|
|
38
|
-
"@itwin/eslint-plugin": "3.0.0-dev.
|
|
39
|
-
"@itwin/express-server": "3.0.0-dev.
|
|
40
|
-
"@itwin/core-backend": "3.0.0-dev.
|
|
41
|
-
"@
|
|
37
|
+
"@itwin/eslint-plugin": "3.0.0-dev.92",
|
|
38
|
+
"@itwin/express-server": "3.0.0-dev.92",
|
|
39
|
+
"@itwin/core-backend": "3.0.0-dev.92",
|
|
40
|
+
"@itwin/projects-client": "^0.2.0",
|
|
42
41
|
"@types/chai": "^4.1.4",
|
|
43
42
|
"@types/chai-as-promised": "^7",
|
|
44
43
|
"@types/mocha": "^8.2.2",
|
|
@@ -62,8 +61,8 @@
|
|
|
62
61
|
"extends": "plugin:@itwin/itwinjs-recommended"
|
|
63
62
|
},
|
|
64
63
|
"scripts": {
|
|
65
|
-
"compile": "npm run -s build",
|
|
66
64
|
"build": "tsc 1>&2 && npm run -s webpack:frontend",
|
|
65
|
+
"build:ci": "npm run -s build",
|
|
67
66
|
"clean": "rimraf lib .rush/temp/package-deps*.json integration_test_results",
|
|
68
67
|
"copy:config": "internal-tools copy-config",
|
|
69
68
|
"cover": "",
|