Skip to content

Commit 80f687e

Browse files
camperkocamperko
committed
Merge remote-tracking branch 'origin/release/7.0.0-rev4' into NAE-2085
# Conflicts: # projects/netgrif-components-core/src/lib/task/services/delegate-task.service.ts
2 parents a01b465 + a536d3a commit 80f687e

File tree

80 files changed

+1294
-1051
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+1294
-1051
lines changed

‎.github/workflows/pr-build.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ on:
55
jobs:
66
matrix-test:
77
name: Matrix Test
8-
runs-on: ubuntu-latest
8+
runs-on: ubuntu-24.04
99
strategy:
1010
matrix:
11-
node-version: [ 18, 20 ]
11+
node-version: [ 20, 22, 24 ]
1212
steps:
1313
- uses: actions/checkout@v4
1414
with:
@@ -17,7 +17,8 @@ jobs:
1717
name: Full Test on Node.js version ${{ matrix.node-version }}
1818
with:
1919
node-version: ${{ matrix.node-version }}
20-
- run: npm i --legacy-peer-deps
20+
- name: Install dependencies
21+
run: npm install --legacy-peer-deps
2122
- name: Build & test components-core
2223
run: |
2324
npm run ncc:build

‎docs/compodoc/components-core/classes/FileUploadModel.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,15 @@
100100

101101
<ul class="nav nav-tabs" role="tablist">
102102
<li class="nav-item">
103-
<a href="#info"
103+
<a href="#info"
104104
class="nav-link"
105105
class="nav-link active"
106106
role="tab" id="info-tab" data-bs-toggle="tab" data-link="info">Info</a>
107107
</li>
108108
<li class="nav-item">
109-
<a href="#source"
109+
<a href="#source"
110110
class="nav-link"
111-
111+
112112
role="tab" id="source-tab" data-bs-toggle="tab" data-link="source">Source</a>
113113
</li>
114114
</ul>
@@ -184,7 +184,7 @@ <h6><b>Properties</b></h6>
184184

185185

186186
<section data-compodoc="block-properties">
187-
187+
188188
<h3 id="inputs">
189189
Properties
190190
</h3>
@@ -449,7 +449,7 @@ <h3 id="inputs">
449449
import {Subscription} from &#x27;rxjs&#x27;;
450450
import {TranslateService} from &#x27;@ngx-translate/core&#x27;;
451451
import {PetriNetEventOutcome} from &#x27;../../../event/model/event-outcomes/petrinet-outcomes/petri-net-event-outcome&#x27;;
452-
import {UriService} from &quot;../../../navigation/service/uri.service&quot;;
452+
import {PathService} from &quot;../../../navigation/service/uri.service&quot;;
453453

454454
export class FileUploadModel {
455455
stringId: string;
@@ -482,7 +482,7 @@ <h3 id="inputs">
482482

483483
constructor(protected _sideMenuControl: SideMenuControl,
484484
protected _petriNetResource: PetriNetResourceService,
485-
protected _uriService: UriService,
485+
protected _uriService: PathService,
486486
protected _log: LoggerService,
487487
protected _snackbar: SnackBarService,
488488
protected _translate: TranslateService) {

‎docs/compodoc/components-core/components/AbstractBreadcrumbsComponent.html

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ <h3 id="constructor">Constructor</h3>
266266
<tr>
267267
<td class="col-md-4">
268268
<span class="modifier">Protected</span>
269-
<code>constructor(_uriService: <a href="../injectables/UriService.html" target="_self">UriService</a>, _caseResourceService: <a href="../injectables/CaseResourceService.html" target="_self">CaseResourceService</a>, _activatedRoute: ActivatedRoute, _router: Router, _dynamicRoutingService: <a href="../injectables/DynamicNavigationRouteProviderService.html" target="_self">DynamicNavigationRouteProviderService</a>, _translateService: TranslateService, _log: <a href="../injectables/LoggerService.html" target="_self">LoggerService</a>)</code>
269+
<code>constructor(_uriService: <a href="../injectables/PathService.html" target="_self">PathService</a>, _caseResourceService: <a href="../injectables/CaseResourceService.html" target="_self">CaseResourceService</a>, _activatedRoute: ActivatedRoute, _router: Router, _dynamicRoutingService: <a href="../injectables/DynamicNavigationRouteProviderService.html" target="_self">DynamicNavigationRouteProviderService</a>, _translateService: TranslateService, _log: <a href="../injectables/LoggerService.html" target="_self">LoggerService</a>)</code>
270270
</td>
271271
</tr>
272272
<tr>
@@ -290,87 +290,87 @@ <h3 id="constructor">Constructor</h3>
290290
<tbody>
291291
<tr>
292292
<td>_uriService</td>
293-
293+
294294
<td>
295-
<code><a href="../injectables/UriService.html" target="_self" >UriService</a></code>
295+
<code><a href="../injectables/PathService.html" target="_self" >PathService</a></code>
296296
</td>
297-
297+
298298
<td>
299299
No
300300
</td>
301-
301+
302302
</tr>
303303
<tr>
304304
<td>_caseResourceService</td>
305-
305+
306306
<td>
307307
<code><a href="../injectables/CaseResourceService.html" target="_self" >CaseResourceService</a></code>
308308
</td>
309-
309+
310310
<td>
311311
No
312312
</td>
313-
313+
314314
</tr>
315315
<tr>
316316
<td>_activatedRoute</td>
317-
317+
318318
<td>
319319
<code>ActivatedRoute</code>
320320
</td>
321-
321+
322322
<td>
323323
No
324324
</td>
325-
325+
326326
</tr>
327327
<tr>
328328
<td>_router</td>
329-
329+
330330
<td>
331331
<code>Router</code>
332332
</td>
333-
333+
334334
<td>
335335
No
336336
</td>
337-
337+
338338
</tr>
339339
<tr>
340340
<td>_dynamicRoutingService</td>
341-
341+
342342
<td>
343343
<code><a href="../injectables/DynamicNavigationRouteProviderService.html" target="_self" >DynamicNavigationRouteProviderService</a></code>
344344
</td>
345-
345+
346346
<td>
347347
No
348348
</td>
349-
349+
350350
</tr>
351351
<tr>
352352
<td>_translateService</td>
353-
353+
354354
<td>
355355
<code>TranslateService</code>
356356
</td>
357-
357+
358358
<td>
359359
No
360360
</td>
361-
361+
362362
</tr>
363363
<tr>
364364
<td>_log</td>
365-
365+
366366
<td>
367367
<code><a href="../injectables/LoggerService.html" target="_self" >LoggerService</a></code>
368368
</td>
369-
369+
370370
<td>
371371
No
372372
</td>
373-
373+
374374
</tr>
375375
</tbody>
376376
</table>
@@ -518,7 +518,7 @@ <h3 id="inputs">Inputs</h3>
518518

519519

520520
<section data-compodoc="block-methods">
521-
521+
522522
<h3 id="methods">
523523
Methods
524524
</h3>
@@ -555,7 +555,7 @@ <h3 id="methods">
555555

556556
<div class="io-description">
557557
<b>Parameters :</b>
558-
558+
559559
<table class="params">
560560
<thead>
561561
<tr>
@@ -597,7 +597,7 @@ <h3 id="methods">
597597

598598
</div>
599599
<div class="io-description">
600-
600+
601601
</div>
602602
</td>
603603
</tr>
@@ -835,7 +835,7 @@ <h3 id="methods">
835835
</table>
836836
</section>
837837
<section data-compodoc="block-properties">
838-
838+
839839
<h3 id="inputs">
840840
Properties
841841
</h3>
@@ -898,7 +898,7 @@ <h3 id="inputs">
898898

899899
<div class="tab-pane fade tab-source-code" id="source">
900900
<pre class="line-numbers compodoc-sourcecode"><code class="language-typescript">import {AfterViewInit, Component, Input, OnDestroy} from &#x27;@angular/core&#x27;;
901-
import {UriService} from &#x27;../service/uri.service&#x27;;
901+
import {PathService} from &#x27;../service/uri.service&#x27;;
902902
import {CaseResourceService} from &quot;../../resources/engine-endpoint/case-resource.service&quot;;
903903
import {CaseSearchRequestBody} from &quot;../../filter/models/case-search-request-body&quot;;
904904
import {HttpParams} from &quot;@angular/common/http&quot;;
@@ -937,7 +937,7 @@ <h3 id="inputs">
937937
private redirectUrls: Map&lt;string, Array&lt;string&gt;&gt;;
938938
private nicePathSubscription: Subscription;
939939

940-
protected constructor(protected _uriService: UriService,
940+
protected constructor(protected _uriService: PathService,
941941
protected _caseResourceService: CaseResourceService,
942942
protected _activatedRoute: ActivatedRoute,
943943
protected _router: Router,
@@ -1091,7 +1091,7 @@ <h3 id="inputs">
10911091
</div>
10921092
</div>
10931093

1094-
1094+
10951095
</div>
10961096

10971097
<script src="../js/libs/vis.min.js"></script>

0 commit comments

Comments
 (0)