[NAE-2125] Remove URI service usage from admin and menu items

- Updated references to `_uriService` to `_pathService` in multiple components.

Author: machacjozef

projects/netgrif-components-core/src/lib/navigation/breadcrumbs/abstract-breadcrumbs.component.ts

@@ -38,7 +38,7 @@ export abstract class AbstractBreadcrumbsComponent implements OnDestroy, AfterVi
     private redirectUrls: Map<string, Array<string>>;
     private nicePathSubscription: Subscription;
 
-    protected constructor(protected _uriService: PathService,
+    protected constructor(protected _pathService: PathService,
                           protected _caseResourceService: CaseResourceService,
                           protected _activatedRoute: ActivatedRoute,
                           protected _router: Router,
@@ -66,7 +66,7 @@ export abstract class AbstractBreadcrumbsComponent implements OnDestroy, AfterVi
             this._log.error("Missing required data for resolving breadcrumbs.")
             return;
         }
-        const splitPath = this._uriService.splitPath(this._uriService.activePath);
+        const splitPath = this._pathService.splitPath(this._pathService.activePath);
         const fullPath = this.createFullPath(splitPath);
         const fullPathQueries = fullPath.map(p => '(processIdentifier:preference_item AND dataSet.nodePath.textValue.keyword:\"' + p + '\")')
         fullPathQueries.push('(taskMongoIds:\"' + filterId + '\")')
@@ -97,7 +97,7 @@ export abstract class AbstractBreadcrumbsComponent implements OnDestroy, AfterVi
         this.nicePathSubscription = this.nicePath.subscribe(np => {
             if (!!np) {
                 const path = np;
-                if (path?.length > this.partsAfterDots + 1 && this._uriService.activePath.length > this.lengthOfPath && !this._showPaths) {
+                if (path?.length > this.partsAfterDots + 1 && this._pathService.activePath.length > this.lengthOfPath && !this._showPaths) {
                     const newPath = [path[0], AbstractBreadcrumbsComponent.DOTS];
                     for (let i = path.length - this.partsAfterDots; i < path.length; i++) {
                         newPath.push(path[i]);
@@ -114,12 +114,12 @@ export abstract class AbstractBreadcrumbsComponent implements OnDestroy, AfterVi
         if (!this.redirectOnClick) {
             return;
         }
-        this._router.navigate(this.redirectUrls.get(this._uriService.activePath)).then(r => {})
+        this._router.navigate(this.redirectUrls.get(this._pathService.activePath)).then(r => {})
     }
 
     public reset(): void {
         this.filterName = undefined;
-        this._uriService.reset();
+        this._pathService.reset();
         this.nicePath.next([""])
     }
 
@@ -130,21 +130,21 @@ export abstract class AbstractBreadcrumbsComponent implements OnDestroy, AfterVi
             return;
         }
         let fullPath: string = '';
-        const tmp = this._uriService.splitPath(this._uriService.activePath);
+        const tmp = this._pathService.splitPath(this._pathService.activePath);
         if (tmp === undefined) return;
         const control = this.resultCounter(count, tmp);
         for (let i = 0; i <= control; i++) {
             fullPath += tmp[i];
             if (i !== control) fullPath += AbstractBreadcrumbsComponent.DELIMETER;
         }
-        this._uriService.activePath = fullPath;
+        this._pathService.activePath = fullPath;
         this.filterName = undefined;
         this.nicePath.next(this.nicePath.value.slice(0, control + 1))
         this.redirect();
     }
 
     private resultCounter(count: number, tmp: string[]): number {
-        if (tmp?.length > this.partsAfterDots + 1 && this._uriService.activePath?.length > this.lengthOfPath && !this._showPaths) {
+        if (tmp?.length > this.partsAfterDots + 1 && this._pathService.activePath?.length > this.lengthOfPath && !this._showPaths) {
             return tmp.length - this.partsAfterDots + (count - 2);
         }
         return count;

projects/netgrif-components-core/src/lib/navigation/navigation-double-drawer/abstract-navigation-double-drawer.spec.ts

@@ -143,13 +143,13 @@ class TestDrawerComponent extends AbstractNavigationDoubleDrawerComponent {
                 _accessService: AccessService,
                 _log: LoggerService,
                 _config: ConfigurationService,
-                _uriService: PathService,
+                _pathService: PathService,
                 _caseResourceService: CaseResourceService,
                 _impersonationUserSelect: ImpersonationUserSelectService,
                 _impersonation: ImpersonationService,
                 _dynamicRouteProviderService: DynamicNavigationRouteProviderService) {
         super(_router, _activatedRoute, _breakpoint, _languageService, _translateService, _userService, _accessService,
-            _log, _config, _uriService, _caseResourceService, _impersonationUserSelect, _impersonation, _dynamicRouteProviderService);
+            _log, _config, _pathService, _caseResourceService, _impersonationUserSelect, _impersonation, _dynamicRouteProviderService);
     }
 }
 

projects/netgrif-components-core/src/lib/side-menu/content-components/import-net/abstract-import-net.component.spec.ts

@@ -109,10 +109,10 @@ class MyPetriNetResource {
 class TestImportComponent extends AbstractImportNetComponent {
     constructor(@Inject(NAE_SIDE_MENU_CONTROL) protected _sideMenuControl: SideMenuControl,
                 protected _petriNetResource: PetriNetResourceService,
-                protected _uriService: PathService,
+                protected _pathService: PathService,
                 protected _log: LoggerService,
                 protected _snackbar: SnackBarService,
                 protected _translate: TranslateService) {
-        super(_sideMenuControl, _petriNetResource,  _uriService, _log, _snackbar, _translate);
+        super(_sideMenuControl, _petriNetResource,  _pathService, _log, _snackbar, _translate);
     }
 }

projects/netgrif-components-core/src/lib/side-menu/content-components/import-net/abstract-import-net.component.ts

@@ -43,7 +43,7 @@ export abstract class AbstractImportNetComponent implements AfterViewInit {
 
     constructor(protected _sideMenuControl: SideMenuControl,
                 protected _petriNetResource: PetriNetResourceService,
-                protected _uriService: PathService,
+                protected _pathService: PathService,
                 protected _log: LoggerService,
                 protected _snackbar: SnackBarService,
                 protected _translate: TranslateService) {

projects/netgrif-components-core/src/lib/side-menu/side-menu-container/abstract-side-menu-container.component.spec.ts

@@ -88,10 +88,10 @@ class TestSideMenuComponent extends AbstractSideMenuContainerComponent {
 class TestImportComponent extends AbstractImportNetComponent {
     constructor(@Inject(NAE_SIDE_MENU_CONTROL) protected _sideMenuControl: SideMenuControl,
                 protected _petriNetResource: PetriNetResourceService,
-                protected _uriService: PathService,
+                protected _pathService: PathService,
                 protected _log: LoggerService,
                 protected _snackbar: SnackBarService,
                 protected _translate: TranslateService) {
-        super(_sideMenuControl, _petriNetResource, _uriService, _log, _snackbar, _translate);
+        super(_sideMenuControl, _petriNetResource, _pathService, _log, _snackbar, _translate);
     }
 }