@itwin/reports-config-widget-react 0.0.6 → 0.0.8
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/.rush/temp/package-deps_rebuild.json +13 -13
- package/.rush/temp/shrinkwrap-deps.json +20 -18
- package/CHANGELOG.json +24 -0
- package/CHANGELOG.md +15 -1
- package/coverage/clover.xml +103 -102
- package/coverage/coverage-final.json +12 -12
- package/coverage/lcov-report/index.html +19 -19
- package/coverage/lcov-report/src/ReportsConfigWidget.ts.html +2 -2
- package/coverage/lcov-report/src/index.html +1 -1
- package/coverage/lcov-report/src/test/index.html +1 -1
- package/coverage/lcov-report/src/test/test-utils.tsx.html +2 -2
- package/coverage/lcov-report/src/widget/ReportsConfigUiProvider.tsx.html +1 -1
- package/coverage/lcov-report/src/widget/components/ActionPanel.tsx.html +1 -1
- package/coverage/lcov-report/src/widget/components/AddMappingsModal.tsx.html +9 -9
- package/coverage/lcov-report/src/widget/components/DeleteModal.tsx.html +4 -4
- package/coverage/lcov-report/src/widget/components/Extraction.tsx.html +13 -13
- package/coverage/lcov-report/src/widget/components/HorizontalTile.tsx.html +2 -2
- package/coverage/lcov-report/src/widget/components/LocalizedTablePaginator.tsx.html +1 -1
- package/coverage/lcov-report/src/widget/components/ReportAction.tsx.html +5 -5
- package/coverage/lcov-report/src/widget/components/ReportMappings.tsx.html +35 -26
- package/coverage/lcov-report/src/widget/components/Reports.tsx.html +34 -34
- package/coverage/lcov-report/src/widget/components/ReportsContainer.tsx.html +1 -1
- package/coverage/lcov-report/src/widget/components/SearchBar.tsx.html +4 -4
- package/coverage/lcov-report/src/widget/components/SelectIModel.tsx.html +1 -1
- package/coverage/lcov-report/src/widget/components/index.html +38 -38
- package/coverage/lcov-report/src/widget/components/utils.tsx.html +30 -30
- package/coverage/lcov-report/src/widget/context/ReportsApiConfigContext.tsx.html +4 -4
- package/coverage/lcov-report/src/widget/context/index.html +1 -1
- package/coverage/lcov-report/src/widget/hooks/index.html +1 -1
- package/coverage/lcov-report/src/widget/hooks/useValidator.ts.html +1 -1
- package/coverage/lcov-report/src/widget/index.html +1 -1
- package/coverage/lcov.info +238 -317
- package/lib/cjs/test/ReportMappings.test.js +42 -31
- package/lib/cjs/test/ReportMappings.test.js.map +1 -1
- package/lib/cjs/test/Reports.test.js +12 -7
- package/lib/cjs/test/Reports.test.js.map +1 -1
- package/lib/cjs/test/test-utils.js.map +1 -1
- package/lib/cjs/tsconfig.tsbuildinfo +1 -1
- package/lib/cjs/widget/components/AddMappingsModal.js +5 -6
- package/lib/cjs/widget/components/AddMappingsModal.js.map +1 -1
- package/lib/cjs/widget/components/Extraction.js +9 -11
- package/lib/cjs/widget/components/Extraction.js.map +1 -1
- package/lib/cjs/widget/components/ReportAction.js +3 -3
- package/lib/cjs/widget/components/ReportAction.js.map +1 -1
- package/lib/cjs/widget/components/ReportMappings.d.ts.map +1 -1
- package/lib/cjs/widget/components/ReportMappings.js +23 -27
- package/lib/cjs/widget/components/ReportMappings.js.map +1 -1
- package/lib/cjs/widget/components/Reports.js +6 -6
- package/lib/cjs/widget/components/Reports.js.map +1 -1
- package/lib/cjs/widget/components/ReportsContainer.scss +3 -0
- package/lib/esm/test/ReportMappings.test.js +42 -31
- package/lib/esm/test/ReportMappings.test.js.map +1 -1
- package/lib/esm/test/Reports.test.js +12 -7
- package/lib/esm/test/Reports.test.js.map +1 -1
- package/lib/esm/test/test-utils.js.map +1 -1
- package/lib/esm/tsconfig.tsbuildinfo +1 -1
- package/lib/esm/widget/components/AddMappingsModal.js +6 -7
- package/lib/esm/widget/components/AddMappingsModal.js.map +1 -1
- package/lib/esm/widget/components/Extraction.js +10 -12
- package/lib/esm/widget/components/Extraction.js.map +1 -1
- package/lib/esm/widget/components/ReportAction.js +4 -4
- package/lib/esm/widget/components/ReportAction.js.map +1 -1
- package/lib/esm/widget/components/ReportMappings.d.ts.map +1 -1
- package/lib/esm/widget/components/ReportMappings.js +24 -28
- package/lib/esm/widget/components/ReportMappings.js.map +1 -1
- package/lib/esm/widget/components/Reports.js +7 -7
- package/lib/esm/widget/components/Reports.js.map +1 -1
- package/lib/esm/widget/components/ReportsContainer.scss +3 -0
- package/package.json +2 -2
- package/reports-config-widget-react.build.error.log +4 -4
- package/reports-config-widget-react.build.log +12 -12
- package/src/test/ReportMappings.test.tsx +44 -24
- package/src/test/Reports.test.tsx +18 -13
- package/src/test/test-utils.tsx +1 -1
- package/src/widget/components/AddMappingsModal.tsx +6 -6
- package/src/widget/components/Extraction.tsx +10 -10
- package/src/widget/components/ReportAction.tsx +4 -4
- package/src/widget/components/ReportMappings.tsx +21 -18
- package/src/widget/components/Reports.tsx +6 -6
- package/src/widget/components/ReportsContainer.scss +3 -0
|
@@ -23,30 +23,30 @@
|
|
|
23
23
|
<div class='clearfix'>
|
|
24
24
|
|
|
25
25
|
<div class='fl pad1y space-right2'>
|
|
26
|
-
<span class="strong">
|
|
26
|
+
<span class="strong">88.02% </span>
|
|
27
27
|
<span class="quiet">Statements</span>
|
|
28
|
-
<span class='fraction'>
|
|
28
|
+
<span class='fraction'>500/568</span>
|
|
29
29
|
</div>
|
|
30
30
|
|
|
31
31
|
|
|
32
32
|
<div class='fl pad1y space-right2'>
|
|
33
|
-
<span class="strong">69.
|
|
33
|
+
<span class="strong">69.53% </span>
|
|
34
34
|
<span class="quiet">Branches</span>
|
|
35
|
-
<span class='fraction'>
|
|
35
|
+
<span class='fraction'>178/256</span>
|
|
36
36
|
</div>
|
|
37
37
|
|
|
38
38
|
|
|
39
39
|
<div class='fl pad1y space-right2'>
|
|
40
|
-
<span class="strong">
|
|
40
|
+
<span class="strong">85.71% </span>
|
|
41
41
|
<span class="quiet">Functions</span>
|
|
42
|
-
<span class='fraction'>
|
|
42
|
+
<span class='fraction'>102/119</span>
|
|
43
43
|
</div>
|
|
44
44
|
|
|
45
45
|
|
|
46
46
|
<div class='fl pad1y space-right2'>
|
|
47
|
-
<span class="strong">
|
|
47
|
+
<span class="strong">88.12% </span>
|
|
48
48
|
<span class="quiet">Lines</span>
|
|
49
|
-
<span class='fraction'>
|
|
49
|
+
<span class='fraction'>475/539</span>
|
|
50
50
|
</div>
|
|
51
51
|
|
|
52
52
|
|
|
@@ -125,17 +125,17 @@
|
|
|
125
125
|
|
|
126
126
|
<tr>
|
|
127
127
|
<td class="file high" data-value="src/widget/components"><a href="src/widget/components/index.html">src/widget/components</a></td>
|
|
128
|
-
<td data-value="
|
|
129
|
-
<div class="chart"><div class="cover-fill" style="width:
|
|
128
|
+
<td data-value="88.46" class="pic high">
|
|
129
|
+
<div class="chart"><div class="cover-fill" style="width: 88%"></div><div class="cover-empty" style="width: 12%"></div></div>
|
|
130
130
|
</td>
|
|
131
|
-
<td data-value="
|
|
132
|
-
<td data-value="
|
|
133
|
-
<td data-value="
|
|
134
|
-
<td data-value="
|
|
135
|
-
<td data-value="
|
|
136
|
-
<td data-value="99" class="abs high">
|
|
137
|
-
<td data-value="
|
|
138
|
-
<td data-value="
|
|
131
|
+
<td data-value="88.46" class="pct high">88.46%</td>
|
|
132
|
+
<td data-value="494" class="abs high">437/494</td>
|
|
133
|
+
<td data-value="71.07" class="pct medium">71.07%</td>
|
|
134
|
+
<td data-value="242" class="abs medium">172/242</td>
|
|
135
|
+
<td data-value="86.86" class="pct high">86.86%</td>
|
|
136
|
+
<td data-value="99" class="abs high">86/99</td>
|
|
137
|
+
<td data-value="88.67" class="pct high">88.67%</td>
|
|
138
|
+
<td data-value="468" class="abs high">415/468</td>
|
|
139
139
|
</tr>
|
|
140
140
|
|
|
141
141
|
<tr>
|
|
@@ -176,7 +176,7 @@
|
|
|
176
176
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
177
177
|
Code coverage generated by
|
|
178
178
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
179
|
-
at
|
|
179
|
+
at Thu Sep 29 2022 19:04:40 GMT+0000 (Coordinated Universal Time)
|
|
180
180
|
</div>
|
|
181
181
|
<script src="prettify.js"></script>
|
|
182
182
|
<script>
|
|
@@ -115,7 +115,7 @@
|
|
|
115
115
|
<span class="cline-any cline-neutral"> </span>
|
|
116
116
|
<span class="cline-any cline-neutral"> </span>
|
|
117
117
|
<span class="cline-any cline-neutral"> </span>
|
|
118
|
-
<span class="cline-any cline-yes">
|
|
118
|
+
<span class="cline-any cline-yes">5391x</span>
|
|
119
119
|
<span class="cline-any cline-neutral"> </span>
|
|
120
120
|
<span class="cline-any cline-neutral"> </span>
|
|
121
121
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -178,7 +178,7 @@ export class ReportsConfigWidget {
|
|
|
178
178
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
179
179
|
Code coverage generated by
|
|
180
180
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
181
|
-
at
|
|
181
|
+
at Thu Sep 29 2022 19:04:40 GMT+0000 (Coordinated Universal Time)
|
|
182
182
|
</div>
|
|
183
183
|
<script src="../prettify.js"></script>
|
|
184
184
|
<script>
|
|
@@ -101,7 +101,7 @@
|
|
|
101
101
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
102
102
|
Code coverage generated by
|
|
103
103
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
104
|
-
at
|
|
104
|
+
at Thu Sep 29 2022 19:04:40 GMT+0000 (Coordinated Universal Time)
|
|
105
105
|
</div>
|
|
106
106
|
<script src="../prettify.js"></script>
|
|
107
107
|
<script>
|
|
@@ -101,7 +101,7 @@
|
|
|
101
101
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
102
102
|
Code coverage generated by
|
|
103
103
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
104
|
-
at
|
|
104
|
+
at Thu Sep 29 2022 19:04:40 GMT+0000 (Coordinated Universal Time)
|
|
105
105
|
</div>
|
|
106
106
|
<script src="../../prettify.js"></script>
|
|
107
107
|
<script>
|
|
@@ -273,7 +273,7 @@ export class TestUtils {
|
|
|
273
273
|
return createStore(
|
|
274
274
|
rootReducer,
|
|
275
275
|
(window as any).__REDUX_DEVTOOLS_EXTENSION__ &&
|
|
276
|
-
|
|
276
|
+
(<span class="branch-1 cbranch-no" title="branch not covered" >window as any).__REDUX_DEVTOOLS_EXTENSION__()</span>
|
|
277
277
|
);
|
|
278
278
|
}
|
|
279
279
|
|
|
@@ -301,7 +301,7 @@ export class TestUtils {
|
|
|
301
301
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
302
302
|
Code coverage generated by
|
|
303
303
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
304
|
-
at
|
|
304
|
+
at Thu Sep 29 2022 19:04:40 GMT+0000 (Coordinated Universal Time)
|
|
305
305
|
</div>
|
|
306
306
|
<script src="../../prettify.js"></script>
|
|
307
307
|
<script>
|
|
@@ -271,7 +271,7 @@ export class ReportsConfigProvider implements UiItemsProvider {
|
|
|
271
271
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
272
272
|
Code coverage generated by
|
|
273
273
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
274
|
-
at
|
|
274
|
+
at Thu Sep 29 2022 19:04:40 GMT+0000 (Coordinated Universal Time)
|
|
275
275
|
</div>
|
|
276
276
|
<script src="../../prettify.js"></script>
|
|
277
277
|
<script>
|
|
@@ -238,7 +238,7 @@ export default ActionPanel;
|
|
|
238
238
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
239
239
|
Code coverage generated by
|
|
240
240
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
241
|
-
at
|
|
241
|
+
at Thu Sep 29 2022 19:04:40 GMT+0000 (Coordinated Universal Time)
|
|
242
242
|
</div>
|
|
243
243
|
<script src="../../../prettify.js"></script>
|
|
244
244
|
<script>
|
|
@@ -30,9 +30,9 @@
|
|
|
30
30
|
|
|
31
31
|
|
|
32
32
|
<div class='fl pad1y space-right2'>
|
|
33
|
-
<span class="strong">
|
|
33
|
+
<span class="strong">83.33% </span>
|
|
34
34
|
<span class="quiet">Branches</span>
|
|
35
|
-
<span class='fraction'>
|
|
35
|
+
<span class='fraction'>5/6</span>
|
|
36
36
|
</div>
|
|
37
37
|
|
|
38
38
|
|
|
@@ -420,7 +420,7 @@
|
|
|
420
420
|
import { Modal, Table, tableFilters } from "@itwin/itwinui-react";
|
|
421
421
|
import React, { useEffect, useMemo, useState } from "react";
|
|
422
422
|
import type { Mapping } from "@itwin/insights-client";
|
|
423
|
-
import { REPORTING_BASE_PATH,
|
|
423
|
+
import { MappingsClient, REPORTING_BASE_PATH, ReportsClient } from "@itwin/insights-client";
|
|
424
424
|
import ActionPanel from "./ActionPanel";
|
|
425
425
|
import "./AddMappingsModal.scss";
|
|
426
426
|
import { LocalizedTablePaginator } from "./LocalizedTablePaginator";
|
|
@@ -442,11 +442,11 @@ const fetchMappings = async (
|
|
|
442
442
|
) => {
|
|
443
443
|
try {
|
|
444
444
|
setIsLoading(true);
|
|
445
|
-
const
|
|
445
|
+
const mappingsClientApi = new MappingsClient(
|
|
446
446
|
generateUrl(REPORTING_BASE_PATH, apiContext.baseUrl)
|
|
447
447
|
);
|
|
448
448
|
const accessToken = await apiContext.getAccessToken();
|
|
449
|
-
const mappings = await
|
|
449
|
+
const mappings = await mappingsClientApi.getMappings(
|
|
450
450
|
accessToken,
|
|
451
451
|
iModelId
|
|
452
452
|
);
|
|
@@ -519,14 +519,14 @@ const AddMappingsModal = ({
|
|
|
519
519
|
try {
|
|
520
520
|
<span class="missing-if-branch" title="if path not taken" >I</span>if (!selectedIModelId) <span class="cstat-no" title="statement not covered" >return;</span>
|
|
521
521
|
setIsLoading(true);
|
|
522
|
-
const
|
|
522
|
+
const reportsClientApi = new ReportsClient(
|
|
523
523
|
generateUrl(REPORTING_BASE_PATH, apiConfig.baseUrl)
|
|
524
524
|
);
|
|
525
525
|
const accessToken = await apiConfig.getAccessToken();
|
|
526
526
|
for (const mapping of selectedMappings) {
|
|
527
|
-
await
|
|
527
|
+
await reportsClientApi.createReportMapping(accessToken, reportId, {
|
|
528
528
|
imodelId: selectedIModelId,
|
|
529
|
-
mappingId: mapping.id
|
|
529
|
+
mappingId: mapping.id,
|
|
530
530
|
});
|
|
531
531
|
}
|
|
532
532
|
|
|
@@ -595,7 +595,7 @@ export default AddMappingsModal;
|
|
|
595
595
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
596
596
|
Code coverage generated by
|
|
597
597
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
598
|
-
at
|
|
598
|
+
at Thu Sep 29 2022 19:04:40 GMT+0000 (Coordinated Universal Time)
|
|
599
599
|
</div>
|
|
600
600
|
<script src="../../../prettify.js"></script>
|
|
601
601
|
<script>
|
|
@@ -195,9 +195,9 @@
|
|
|
195
195
|
<span class="cline-any cline-neutral"> </span>
|
|
196
196
|
<span class="cline-any cline-neutral"> </span>
|
|
197
197
|
<span class="cline-any cline-neutral"> </span>
|
|
198
|
-
<span class="cline-any cline-yes">
|
|
198
|
+
<span class="cline-any cline-yes">158x</span>
|
|
199
199
|
<span class="cline-any cline-neutral"> </span>
|
|
200
|
-
<span class="cline-any cline-yes">
|
|
200
|
+
<span class="cline-any cline-yes">158x</span>
|
|
201
201
|
<span class="cline-any cline-yes">2x</span>
|
|
202
202
|
<span class="cline-any cline-yes">2x</span>
|
|
203
203
|
<span class="cline-any cline-yes">2x</span>
|
|
@@ -210,7 +210,7 @@
|
|
|
210
210
|
<span class="cline-any cline-neutral"> </span>
|
|
211
211
|
<span class="cline-any cline-neutral"> </span>
|
|
212
212
|
<span class="cline-any cline-neutral"> </span>
|
|
213
|
-
<span class="cline-any cline-yes">
|
|
213
|
+
<span class="cline-any cline-yes">158x</span>
|
|
214
214
|
<span class="cline-any cline-neutral"> </span>
|
|
215
215
|
<span class="cline-any cline-neutral"> </span>
|
|
216
216
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -370,7 +370,7 @@ export default DeleteModal;
|
|
|
370
370
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
371
371
|
Code coverage generated by
|
|
372
372
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
373
|
-
at
|
|
373
|
+
at Thu Sep 29 2022 19:04:40 GMT+0000 (Coordinated Universal Time)
|
|
374
374
|
</div>
|
|
375
375
|
<script src="../../../prettify.js"></script>
|
|
376
376
|
<script>
|
|
@@ -30,9 +30,9 @@
|
|
|
30
30
|
|
|
31
31
|
|
|
32
32
|
<div class='fl pad1y space-right2'>
|
|
33
|
-
<span class="strong">
|
|
33
|
+
<span class="strong">79.48% </span>
|
|
34
34
|
<span class="quiet">Branches</span>
|
|
35
|
-
<span class='fraction'>
|
|
35
|
+
<span class='fraction'>31/39</span>
|
|
36
36
|
</div>
|
|
37
37
|
|
|
38
38
|
|
|
@@ -706,7 +706,7 @@ import {
|
|
|
706
706
|
} from "@itwin/itwinui-react";
|
|
707
707
|
import * as React from "react";
|
|
708
708
|
import { useEffect, useMemo, useRef, useState } from "react";
|
|
709
|
-
import {
|
|
709
|
+
import { ExtractionClient, REPORTING_BASE_PATH } from "@itwin/insights-client";
|
|
710
710
|
import { generateUrl, handleError, SkeletonBlock } from "./utils";
|
|
711
711
|
import "./Extraction.scss";
|
|
712
712
|
import {
|
|
@@ -880,15 +880,15 @@ export const Extraction = ({
|
|
|
880
880
|
try {
|
|
881
881
|
setExtractionState(ExtractionStates.Starting);
|
|
882
882
|
setExtractingIModelId(iModelId);
|
|
883
|
-
const
|
|
883
|
+
const extractionClientApi = new ExtractionClient(
|
|
884
884
|
generateUrl(REPORTING_BASE_PATH, apiConfig.baseUrl)
|
|
885
885
|
);
|
|
886
886
|
const accessToken = await apiConfig.getAccessToken();
|
|
887
|
-
const response = await
|
|
887
|
+
const response = await extractionClientApi.runExtraction(
|
|
888
888
|
accessToken,
|
|
889
889
|
iModelId
|
|
890
890
|
);
|
|
891
|
-
jobId.current = response.
|
|
891
|
+
jobId.current = response.id;
|
|
892
892
|
setIsRunning(true);
|
|
893
893
|
setExtractionState(ExtractionStates.FetchingUpdate);
|
|
894
894
|
} catch (error: any) {
|
|
@@ -902,23 +902,23 @@ export const Extraction = ({
|
|
|
902
902
|
useEffect(() => {
|
|
903
903
|
if (!intervalId.current && isRunning) {
|
|
904
904
|
const newIntervalId = window.setInterval(async () => {
|
|
905
|
-
const
|
|
905
|
+
const extractionClientApi = new ExtractionClient(
|
|
906
906
|
generateUrl(REPORTING_BASE_PATH, apiConfig.baseUrl)
|
|
907
907
|
);
|
|
908
908
|
const accessToken = await apiConfig.getAccessToken();
|
|
909
|
-
const response = await
|
|
909
|
+
const response = await extractionClientApi.getExtractionStatus(
|
|
910
910
|
accessToken,
|
|
911
911
|
jobId.current
|
|
912
912
|
);
|
|
913
|
-
if (response.
|
|
913
|
+
if (response.state === "Queued") {
|
|
914
914
|
setExtractionState(ExtractionStates.Queued);
|
|
915
|
-
} else if (response.
|
|
915
|
+
} else if (response.state === "Running") {
|
|
916
916
|
setExtractionState(ExtractionStates.Running);
|
|
917
|
-
} else if (response.
|
|
917
|
+
} else if (response.state === "Succeeded") {
|
|
918
918
|
setExtractionState(ExtractionStates.Succeeded);
|
|
919
919
|
setIsRunning(false);
|
|
920
920
|
setCurrentIModelId(undefined);
|
|
921
|
-
} else <span class="cstat-no" title="statement not covered" ><span class="missing-if-branch" title="if path not taken" >I</span><span class="missing-if-branch" title="else path not taken" >E</span>if (response.
|
|
921
|
+
} else <span class="cstat-no" title="statement not covered" ><span class="missing-if-branch" title="if path not taken" >I</span><span class="missing-if-branch" title="else path not taken" >E</span>if (response.state === "Failed") {</span>
|
|
922
922
|
<span class="cstat-no" title="statement not covered" > setExtractionState(ExtractionStates.Failed);</span>
|
|
923
923
|
<span class="cstat-no" title="statement not covered" > setIsRunning(false);</span>
|
|
924
924
|
<span class="cstat-no" title="statement not covered" > setCurrentIModelId(undefined);</span>
|
|
@@ -1015,7 +1015,7 @@ export const Extraction = ({
|
|
|
1015
1015
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
1016
1016
|
Code coverage generated by
|
|
1017
1017
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
1018
|
-
at
|
|
1018
|
+
at Thu Sep 29 2022 19:04:40 GMT+0000 (Coordinated Universal Time)
|
|
1019
1019
|
</div>
|
|
1020
1020
|
<script src="../../../prettify.js"></script>
|
|
1021
1021
|
<script>
|
|
@@ -146,7 +146,7 @@
|
|
|
146
146
|
<span class="cline-any cline-neutral"> </span>
|
|
147
147
|
<span class="cline-any cline-neutral"> </span>
|
|
148
148
|
<span class="cline-any cline-neutral"> </span>
|
|
149
|
-
<span class="cline-any cline-yes">
|
|
149
|
+
<span class="cline-any cline-yes">290x</span>
|
|
150
150
|
<span class="cline-any cline-neutral"> </span>
|
|
151
151
|
<span class="cline-any cline-neutral"> </span>
|
|
152
152
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -241,7 +241,7 @@ export const HorizontalTile = ({
|
|
|
241
241
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
242
242
|
Code coverage generated by
|
|
243
243
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
244
|
-
at
|
|
244
|
+
at Thu Sep 29 2022 19:04:40 GMT+0000 (Coordinated Universal Time)
|
|
245
245
|
</div>
|
|
246
246
|
<script src="../../../prettify.js"></script>
|
|
247
247
|
<script>
|
|
@@ -247,7 +247,7 @@ export const LocalizedTablePaginator = (props: TablePaginatorRendererProps) =>
|
|
|
247
247
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
248
248
|
Code coverage generated by
|
|
249
249
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
250
|
-
at
|
|
250
|
+
at Thu Sep 29 2022 19:04:40 GMT+0000 (Coordinated Universal Time)
|
|
251
251
|
</div>
|
|
252
252
|
<script src="../../../prettify.js"></script>
|
|
253
253
|
<script>
|
|
@@ -371,7 +371,7 @@ import {
|
|
|
371
371
|
} from "./utils";
|
|
372
372
|
import "./ReportAction.scss";
|
|
373
373
|
import type { Report } from "@itwin/insights-client";
|
|
374
|
-
import { REPORTING_BASE_PATH,
|
|
374
|
+
import { REPORTING_BASE_PATH, ReportsClient } from "@itwin/insights-client";
|
|
375
375
|
import { useReportsApiConfig } from "../context/ReportsApiConfigContext";
|
|
376
376
|
import { ReportsConfigWidget } from "../../ReportsConfigWidget";
|
|
377
377
|
|
|
@@ -397,16 +397,16 @@ const ReportAction = ({ iTwinId, report, returnFn }: ReportActionProps) => {
|
|
|
397
397
|
return;
|
|
398
398
|
}
|
|
399
399
|
setIsLoading(true);
|
|
400
|
-
const
|
|
400
|
+
const reportsClientApi = new ReportsClient(
|
|
401
401
|
generateUrl(REPORTING_BASE_PATH, apiConfig.baseUrl)
|
|
402
402
|
);
|
|
403
403
|
const accessToken = await apiConfig.getAccessToken();
|
|
404
404
|
report
|
|
405
|
-
? <span class="branch-0 cbranch-no" title="branch not covered" >await
|
|
405
|
+
? <span class="branch-0 cbranch-no" title="branch not covered" >await reportsClientApi.updateReport(accessToken, report.id ?? "", {</span>
|
|
406
406
|
displayName: values.name,
|
|
407
407
|
description: values.description,
|
|
408
408
|
})
|
|
409
|
-
: await
|
|
409
|
+
: await reportsClientApi.createReport(accessToken, {
|
|
410
410
|
displayName: values.name,
|
|
411
411
|
description: values.description,
|
|
412
412
|
projectId: iTwinId,
|
|
@@ -508,7 +508,7 @@ export default ReportAction;
|
|
|
508
508
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
509
509
|
Code coverage generated by
|
|
510
510
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
511
|
-
at
|
|
511
|
+
at Thu Sep 29 2022 19:04:40 GMT+0000 (Coordinated Universal Time)
|
|
512
512
|
</div>
|
|
513
513
|
<script src="../../../prettify.js"></script>
|
|
514
514
|
<script>
|
|
@@ -23,16 +23,16 @@
|
|
|
23
23
|
<div class='clearfix'>
|
|
24
24
|
|
|
25
25
|
<div class='fl pad1y space-right2'>
|
|
26
|
-
<span class="strong">96.
|
|
26
|
+
<span class="strong">96.34% </span>
|
|
27
27
|
<span class="quiet">Statements</span>
|
|
28
|
-
<span class='fraction'>
|
|
28
|
+
<span class='fraction'>79/82</span>
|
|
29
29
|
</div>
|
|
30
30
|
|
|
31
31
|
|
|
32
32
|
<div class='fl pad1y space-right2'>
|
|
33
|
-
<span class="strong">
|
|
33
|
+
<span class="strong">73.68% </span>
|
|
34
34
|
<span class="quiet">Branches</span>
|
|
35
|
-
<span class='fraction'>
|
|
35
|
+
<span class='fraction'>28/38</span>
|
|
36
36
|
</div>
|
|
37
37
|
|
|
38
38
|
|
|
@@ -44,9 +44,9 @@
|
|
|
44
44
|
|
|
45
45
|
|
|
46
46
|
<div class='fl pad1y space-right2'>
|
|
47
|
-
<span class="strong">96.
|
|
47
|
+
<span class="strong">96.29% </span>
|
|
48
48
|
<span class="quiet">Lines</span>
|
|
49
|
-
<span class='fraction'>
|
|
49
|
+
<span class='fraction'>78/81</span>
|
|
50
50
|
</div>
|
|
51
51
|
|
|
52
52
|
|
|
@@ -413,7 +413,10 @@
|
|
|
413
413
|
<a name='L348'></a><a href='#L348'>348</a>
|
|
414
414
|
<a name='L349'></a><a href='#L349'>349</a>
|
|
415
415
|
<a name='L350'></a><a href='#L350'>350</a>
|
|
416
|
-
<a name='L351'></a><a href='#L351'>351</a
|
|
416
|
+
<a name='L351'></a><a href='#L351'>351</a>
|
|
417
|
+
<a name='L352'></a><a href='#L352'>352</a>
|
|
418
|
+
<a name='L353'></a><a href='#L353'>353</a>
|
|
419
|
+
<a name='L354'></a><a href='#L354'>354</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral"> </span>
|
|
417
420
|
<span class="cline-any cline-neutral"> </span>
|
|
418
421
|
<span class="cline-any cline-neutral"> </span>
|
|
419
422
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -487,6 +490,9 @@
|
|
|
487
490
|
<span class="cline-any cline-neutral"> </span>
|
|
488
491
|
<span class="cline-any cline-neutral"> </span>
|
|
489
492
|
<span class="cline-any cline-yes">8x</span>
|
|
493
|
+
<span class="cline-any cline-neutral"> </span>
|
|
494
|
+
<span class="cline-any cline-neutral"> </span>
|
|
495
|
+
<span class="cline-any cline-yes">8x</span>
|
|
490
496
|
<span class="cline-any cline-yes">8x</span>
|
|
491
497
|
<span class="cline-any cline-neutral"> </span>
|
|
492
498
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -795,7 +801,7 @@ import {
|
|
|
795
801
|
import "./ReportMappings.scss";
|
|
796
802
|
import DeleteModal from "./DeleteModal";
|
|
797
803
|
import type { Report, ReportMapping } from "@itwin/insights-client";
|
|
798
|
-
import { REPORTING_BASE_PATH,
|
|
804
|
+
import { MappingsClient, REPORTING_BASE_PATH, ReportsClient } from "@itwin/insights-client";
|
|
799
805
|
import AddMappingsModal from "./AddMappingsModal";
|
|
800
806
|
import type {
|
|
801
807
|
GetSingleIModelParams,
|
|
@@ -833,11 +839,14 @@ const fetchReportMappings = async (
|
|
|
833
839
|
) => {
|
|
834
840
|
try {
|
|
835
841
|
setIsLoading(true);
|
|
836
|
-
const
|
|
842
|
+
const reportsClientApi = new ReportsClient(
|
|
843
|
+
generateUrl(REPORTING_BASE_PATH, apiContext.baseUrl)
|
|
844
|
+
);
|
|
845
|
+
const mappingsClientApi = new MappingsClient(
|
|
837
846
|
generateUrl(REPORTING_BASE_PATH, apiContext.baseUrl)
|
|
838
847
|
);
|
|
839
848
|
const accessToken = await apiContext.getAccessToken();
|
|
840
|
-
const reportMappings = await
|
|
849
|
+
const reportMappings = await reportsClientApi.getReportMappings(
|
|
841
850
|
accessToken,
|
|
842
851
|
reportId
|
|
843
852
|
);
|
|
@@ -850,13 +859,13 @@ const fetchReportMappings = async (
|
|
|
850
859
|
AccessTokenAdapter.toAuthorizationCallback(accessToken);
|
|
851
860
|
const iModelNames = new Map<string, string>();
|
|
852
861
|
const reportMappingsAndMapping = await Promise.all(
|
|
853
|
-
reportMappings
|
|
854
|
-
const iModelId = reportMapping.imodelId
|
|
862
|
+
reportMappings.map(async (reportMapping) => {
|
|
863
|
+
const iModelId = reportMapping.imodelId;
|
|
855
864
|
let iModelName = "";
|
|
856
|
-
const mapping = await
|
|
865
|
+
const mapping = await mappingsClientApi.getMapping(
|
|
857
866
|
accessToken,
|
|
858
|
-
|
|
859
|
-
|
|
867
|
+
iModelId,
|
|
868
|
+
reportMapping.mappingId
|
|
860
869
|
);
|
|
861
870
|
<span class="missing-if-branch" title="if path not taken" >I</span>if (iModelNames.has(iModelId)) {
|
|
862
871
|
<span class="cstat-no" title="statement not covered" > iModelName = iModelNames.get(iModelId) ?? "";</span>
|
|
@@ -872,8 +881,8 @@ const fetchReportMappings = async (
|
|
|
872
881
|
const reportMappingAndMapping: ReportMappingAndMapping = {
|
|
873
882
|
...reportMapping,
|
|
874
883
|
iModelName,
|
|
875
|
-
mappingName: mapping.
|
|
876
|
-
mappingDescription: mapping.
|
|
884
|
+
mappingName: mapping.mappingName,
|
|
885
|
+
mappingDescription: mapping.description ?? <span class="branch-1 cbranch-no" title="branch not covered" >"",</span>
|
|
877
886
|
};
|
|
878
887
|
return reportMappingAndMapping;
|
|
879
888
|
}) ?? <span class="branch-1 cbranch-no" title="branch not covered" >[]</span>
|
|
@@ -914,7 +923,7 @@ export const ReportMappings = ({ report, goBack }: ReportMappingsProps) => {
|
|
|
914
923
|
useEffect(() => {
|
|
915
924
|
void fetchReportMappings(
|
|
916
925
|
setReportMappings,
|
|
917
|
-
report.id
|
|
926
|
+
report.id,
|
|
918
927
|
setIsLoading,
|
|
919
928
|
apiConfig
|
|
920
929
|
);
|
|
@@ -924,7 +933,7 @@ export const ReportMappings = ({ report, goBack }: ReportMappingsProps) => {
|
|
|
924
933
|
setReportMappingsView(ReportMappingsView.REPORTMAPPINGS);
|
|
925
934
|
await fetchReportMappings(
|
|
926
935
|
setReportMappings,
|
|
927
|
-
report.id
|
|
936
|
+
report.id,
|
|
928
937
|
setIsLoading,
|
|
929
938
|
apiConfig
|
|
930
939
|
);
|
|
@@ -938,7 +947,7 @@ export const ReportMappings = ({ report, goBack }: ReportMappingsProps) => {
|
|
|
938
947
|
() =>
|
|
939
948
|
new Map(
|
|
940
949
|
reportMappings.map((mapping) => [
|
|
941
|
-
mapping.imodelId
|
|
950
|
+
mapping.imodelId,
|
|
942
951
|
mapping.iModelName,
|
|
943
952
|
])
|
|
944
953
|
),
|
|
@@ -963,7 +972,7 @@ export const ReportMappings = ({ report, goBack }: ReportMappingsProps) => {
|
|
|
963
972
|
|
|
964
973
|
return (
|
|
965
974
|
<>
|
|
966
|
-
<WidgetHeader title={report.displayName
|
|
975
|
+
<WidgetHeader title={report.displayName} returnFn={goBack} />
|
|
967
976
|
<div className="report-mapping-misc">
|
|
968
977
|
<LabeledInput
|
|
969
978
|
label={ReportsConfigWidget.localization.getLocalizedString(
|
|
@@ -1089,7 +1098,7 @@ export const ReportMappings = ({ report, goBack }: ReportMappingsProps) => {
|
|
|
1089
1098
|
</Surface>
|
|
1090
1099
|
<AddMappingsModal
|
|
1091
1100
|
show={reportMappingsView === ReportMappingsView.ADDING}
|
|
1092
|
-
reportId={report.id
|
|
1101
|
+
reportId={report.id}
|
|
1093
1102
|
existingMappings={reportMappings}
|
|
1094
1103
|
returnFn={refresh}
|
|
1095
1104
|
/>
|
|
@@ -1098,13 +1107,13 @@ export const ReportMappings = ({ report, goBack }: ReportMappingsProps) => {
|
|
|
1098
1107
|
show={showDeleteModal}
|
|
1099
1108
|
setShow={setShowDeleteModal}
|
|
1100
1109
|
onDelete={async () => {
|
|
1101
|
-
const
|
|
1110
|
+
const reportsClientApi = new ReportsClient(
|
|
1102
1111
|
generateUrl(REPORTING_BASE_PATH, apiConfig.baseUrl)
|
|
1103
1112
|
);
|
|
1104
1113
|
const accessToken = await apiConfig.getAccessToken();
|
|
1105
|
-
await
|
|
1114
|
+
await reportsClientApi.deleteReportMapping(
|
|
1106
1115
|
accessToken,
|
|
1107
|
-
report.id
|
|
1116
|
+
report.id,
|
|
1108
1117
|
selectedReportMapping<span class="branch-0 cbranch-no" title="branch not covered" >?.m</span>appingId ?? <span class="branch-1 cbranch-no" title="branch not covered" >""</span>
|
|
1109
1118
|
);
|
|
1110
1119
|
}}
|
|
@@ -1120,7 +1129,7 @@ export const ReportMappings = ({ report, goBack }: ReportMappingsProps) => {
|
|
|
1120
1129
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
1121
1130
|
Code coverage generated by
|
|
1122
1131
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
1123
|
-
at
|
|
1132
|
+
at Thu Sep 29 2022 19:04:40 GMT+0000 (Coordinated Universal Time)
|
|
1124
1133
|
</div>
|
|
1125
1134
|
<script src="../../../prettify.js"></script>
|
|
1126
1135
|
<script>
|