chore(shared): shared organization context ngrx pipe

packages/core/state/src/lib/+state/management/organization/organization.effects.ts

@@ -21,9 +21,41 @@ import { AppFacade } from '../../app';
 import * as organizationActions from './organization.actions';
 import { concatLatestFrom } from '@ngrx/operators';
 import { OrganizationFacade } from './organization.facade';
+import { RouterFacade } from '@console-core/state';
 
 @Injectable()
 export class OrganizationEffects {
+  // updateOrgUrl$ = createEffect(
+  //   () =>
+  //     this.actions$.pipe(
+  //       ofType(
+  //         organizationActions.setSelectedGlobalOrganizationId,
+  //         organizationActions.selectedGlobalOrganizationHistory,
+  //         organizationActions.setPreviousSelectedGlobalOrganizationHistory,
+  //         organizationActions.cancelSelection
+  //       ),
+  //       concatLatestFrom(() => [
+  //         this.organizationFacade.globalOrganizationLeafId$,
+  //         this.organizationFacade.globalOrganizationId$,
+  //         this.routerFacade.url$,
+  //         this.routerFacade.params$,
+  //       ]),
+  //       switchMap(
+  //         ([, organizationLeaf, organization, currentRoute, params]) => {
+  //           const newUrl = currentRoute.replace(
+  //             params.org,
+  //             organizationLeaf || organization
+  //           );
+
+  //           this.routerFacade.navigateByUrl(newUrl);
+
+  //           return [];
+  //         }
+  //       )
+  //     ),
+  //   { dispatch: false }
+  // );
+
   organizationReadRequest$ = createEffect(() => {
     return this.actions$.pipe(
       ofType(organizationActions.organizationReadRequest),
@@ -355,6 +387,7 @@ export class OrganizationEffects {
     private readonly router: Router,
     private readonly actions$: Actions,
     private readonly appFacade: AppFacade,
+    private readonly routerFacade: RouterFacade,
     private readonly organizationService: OrganizationService,
     private readonly organizationFacade: OrganizationFacade,
     private readonly errorHandlingService: ErrorHandlingService

packages/core/state/src/lib/utils/with-latest-organization-data.ts

@@ -0,0 +1,33 @@
+import { ofType } from '@ngrx/effects';
+import { concatLatestFrom } from '@ngrx/operators';
+import { Action } from '@ngrx/store';
+import { Observable, OperatorFunction } from 'rxjs';
+
+import * as organizationActions from '../+state/management/organization/organization.actions';
+import { OrganizationFacade } from '../+state/management/organization/organization.facade';
+
+// Import your organization actions
+export type OrganizationDataTuple = [
+  globalOrganizationLeafId: string,
+  globalOrganizationId: string
+];
+
+export function withLatestOrganizationData<T extends Action>(
+  organizationFacade: OrganizationFacade,
+  ...additionalActionTypes: string[]
+): OperatorFunction<T, [T, ...OrganizationDataTuple]> {
+  return (source$: Observable<T>) =>
+    source$.pipe(
+      ofType<T>(
+        ...additionalActionTypes, // Primary effect-specific actions
+        organizationActions.setSelectedGlobalOrganizationId.type,
+        organizationActions.selectedGlobalOrganizationHistory.type,
+        organizationActions.setPreviousSelectedGlobalOrganizationHistory.type,
+        organizationActions.cancelSelection.type
+      ),
+      concatLatestFrom(() => [
+        organizationFacade.globalOrganizationLeafId$,
+        organizationFacade.globalOrganizationId$,
+      ])
+    ) as Observable<[T, ...OrganizationDataTuple]>;
+}

packages/modules/ui/src/lib/components/organisms/header/header-toolbar.component.ts

@@ -69,11 +69,6 @@ export class RcHeaderToolbarComponent implements OnInit {
     this.organizationFacade.cancelSelection();
   }
 
-  onSearchOrganizations(str: string): void {
-    // TODO: Implement search
-    console.log('Search', str);
-  }
-
   onAccountItemSelected(value: string) {
     switch (value) {
       case 'profile':

packages/modules/ui/src/lib/components/templates/private/private-template.component.ts

@@ -114,6 +114,7 @@ export class RcPrivateTemplateComponent implements OnInit, OnDestroy {
         })
       )
       .subscribe((currentRoute: string) => {
+        console.log('***currentRouter:', currentRoute);
         this.currentRoute = currentRoute;
         this.changeDetectorRef.markForCheck();
         this.changeDetectorRef.detectChanges();