chore: use organization context for resource filtering

belsman · belsman · commit 680211a96a1b · 2025-03-10T13:50:33.000+01:00
diff --git a/packages/core/config/src/lib/constants/store.ts b/packages/core/config/src/lib/constants/store.ts
@@ -14,7 +14,8 @@ export const STORE: Readonly<IStoreConstant> = {
     invoiceState: 'invoiceStateV1',
     localeState: 'localeStateV1',
     orderState: 'orderStateV1',
-    organizationState: 'organizationStateV3',
+    organizationState: 'organizationStateV4',
+    organizationContextState: 'organizationContextStateV1',
     policyState: 'policyStateV1',
     productState: 'productStateV1',
     roleState: 'roleStateV1',
diff --git a/packages/core/state/src/lib/+state/fulfillment/fulfillment.effects.ts b/packages/core/state/src/lib/+state/fulfillment/fulfillment.effects.ts
@@ -17,7 +17,7 @@ import { AppFacade } from '../app';
 import * as fulfillmentActions from './fulfillment.actions';
 import {
   FulfillmentFacade,
-  OrganizationFacade,
+  OrganizationContextFacade,
   withLatestOrganizationData,
 } from '@console-core/state';
 import { IoRestorecommerceResourcebaseFilterOperation } from '@console-core/graphql';
@@ -27,7 +27,7 @@ export class FulfillmentEffects {
   fulfillmentReadRequest$ = createEffect(() => {
     return this.actions$.pipe(
       withLatestOrganizationData(
-        this.organizationFacade,
+        this.organizationContextFacade,
         fulfillmentActions.fulfillmentReadRequest.type
       ),
       switchMap(([action, organization]) =>
@@ -279,7 +279,7 @@ export class FulfillmentEffects {
     private readonly router: Router,
     private readonly actions$: Actions,
     private readonly appFacade: AppFacade,
-    private readonly organizationFacade: OrganizationFacade,
+    private readonly organizationContextFacade: OrganizationContextFacade,
     private readonly fulfilmentFacade: FulfillmentFacade,
     private readonly fulfillmentService: FulfillmentService,
     private readonly errorHandlingService: ErrorHandlingService
diff --git a/packages/core/state/src/lib/+state/index.ts b/packages/core/state/src/lib/+state/index.ts
@@ -4,6 +4,7 @@ export * from './authn';
 export * from './fulfillment';
 export * from './invoice';
 export * from './management';
+export * from './organization-context';
 export * from './order';
 export * from './product';
 export * from './router';
diff --git a/packages/core/state/src/lib/+state/management/country/country.effects.ts b/packages/core/state/src/lib/+state/management/country/country.effects.ts
@@ -20,7 +20,7 @@ import { AppFacade } from '../../app';
 
 import * as countryActions from './country.actions';
 import {
-  OrganizationFacade,
+  OrganizationContextFacade,
   withLatestOrganizationData,
 } from '@console-core/state';
 
@@ -29,7 +29,7 @@ export class CountryEffects {
   countryReadRequest$ = createEffect(() => {
     return this.actions$.pipe(
       withLatestOrganizationData(
-        this.organizationFacade,
+        this.organizationContextFacade,
         countryActions.countryReadRequest.type
       ),
       exhaustMap(([action, organization]) =>
@@ -271,7 +271,7 @@ export class CountryEffects {
     private readonly actions$: Actions,
     private readonly appFacade: AppFacade,
     private readonly countryService: CountryService,
-    private readonly organizationFacade: OrganizationFacade,
+    private readonly organizationContextFacade: OrganizationContextFacade,
     private readonly errorHandlingService: ErrorHandlingService
   ) {}
 }
diff --git a/packages/core/state/src/lib/+state/management/organization/organization.effects.ts b/packages/core/state/src/lib/+state/management/organization/organization.effects.ts
@@ -304,31 +304,6 @@ export class OrganizationEffects {
     { dispatch: false }
   );
 
-  handleOrganizationChangedNotification$ = createEffect(
-    () => {
-      return this.actions$.pipe(
-        ofType(
-          organizationActions.setSelectedGlobalOrganizationId,
-          organizationActions.selectedGlobalOrganizationHistory,
-          organizationActions.setPreviousSelectedGlobalOrganizationHistory,
-          organizationActions.cancelSelection
-        ),
-        concatLatestFrom(() => [
-          this.organizationFacade.globalOrganizationLeaf$,
-          this.organizationFacade.globalOrganization$,
-        ]),
-        tap(([, leafOrganization, parentOrganization]) => {
-          const organization = leafOrganization || parentOrganization;
-          this.appFacade.addNotification({
-            content: `Organization changed to ${organization?.name}`,
-            type: ENotificationTypes.Info,
-          });
-        })
-      );
-    },
-    { dispatch: false }
-  );
-
   handleNotificationErrors$ = createEffect(
     () => {
       return this.actions$.pipe(
diff --git a/packages/core/state/src/lib/+state/management/organization/organization.facade.ts b/packages/core/state/src/lib/+state/management/organization/organization.facade.ts
@@ -54,24 +54,6 @@ export class OrganizationFacade {
   readonly childsAll$ = this.store.select(
     organizationSelectors.selectOrganizationChildsAll
   );
-  readonly globalOrganizationId$ = this.store.select(
-    organizationSelectors.selectOrganizationSelectedGlobalOrganizationId
-  );
-  readonly globalOrganization$ = this.store.select(
-    organizationSelectors.selectOrganizationSelectedGlobalOrganization
-  );
-
-  readonly globalChildrenOrganizations$ = this.store.select(
-    organizationSelectors.selectGlobalChildrenOrganizations
-  );
-
-  readonly globalOrganizationLeafId$ = this.store.select(
-    organizationSelectors.selectGlobalOrganizationLeafId
-  );
-
-  readonly globalOrganizationLeaf$ = this.store.select(
-    organizationSelectors.selectGlobalOrganizationLeaf
-  );
 
   readonly actionStatus$ = this.store.select(
     organizationSelectors.selectActionStatus
@@ -93,23 +75,6 @@ export class OrganizationFacade {
     );
   setSelectedId = (payload: string | null) =>
     this.store.dispatch(organizationActions.setSelectedId({ payload }));
-  setSelectedGlobalOrganizationId = (payload: string | null) =>
-    this.store.dispatch(
-      organizationActions.setSelectedGlobalOrganizationId({ payload })
-    );
-
-  resetSelectedGlobalOrganization = () =>
-    this.store.dispatch(
-      organizationActions.selectedGlobalOrganizationHistory()
-    );
-
-  lastSelectedGlobalOrganization = () =>
-    this.store.dispatch(
-      organizationActions.setPreviousSelectedGlobalOrganizationHistory()
-    );
-
-  cancelSelection = () =>
-    this.store.dispatch(organizationActions.cancelSelection());
 
   create = (payload: IIoRestorecommerceOrganizationOrganizationList) =>
     this.store.dispatch(
diff --git a/packages/core/state/src/lib/+state/management/shop/shop.effects.ts b/packages/core/state/src/lib/+state/management/shop/shop.effects.ts
@@ -20,7 +20,7 @@ import { AppFacade } from '../../app';
 
 import * as shopActions from './shop.actions';
 import {
-  OrganizationFacade,
+  OrganizationContextFacade,
   withLatestOrganizationData,
 } from '@console-core/state';
 
@@ -29,7 +29,7 @@ export class ShopEffects {
   shopReadRequest$ = createEffect(() => {
     return this.actions$.pipe(
       withLatestOrganizationData(
-        this.organizationFacade,
+        this.organizationContextFacade,
         shopActions.shopReadRequest.type
       ),
       exhaustMap(([action, organization]) =>
@@ -281,7 +281,7 @@ export class ShopEffects {
     private readonly actions$: Actions,
     private readonly appFacade: AppFacade,
     private readonly shopService: ShopService,
-    private readonly organizationFacade: OrganizationFacade,
+    private readonly organizationContextFacade: OrganizationContextFacade,
     private readonly errorHandlingService: ErrorHandlingService
   ) {}
 }
diff --git a/packages/core/state/src/lib/+state/order/order.effects.ts b/packages/core/state/src/lib/+state/order/order.effects.ts
@@ -23,7 +23,7 @@ import { AppFacade } from '../app';
 import * as orderActions from './order.actions';
 import { OrderFacade } from './order.facade';
 import {
-  OrganizationFacade,
+  OrganizationContextFacade,
   withLatestOrganizationData,
 } from '@console-core/state';
 
@@ -32,7 +32,7 @@ export class OrderEffects {
   orderReadRequest$ = createEffect(() => {
     return this.actions$.pipe(
       withLatestOrganizationData(
-        this.organizationFacade,
+        this.organizationContextFacade,
         orderActions.orderReadRequest.type
       ),
       exhaustMap(([action, organization]) => {
@@ -322,7 +322,7 @@ export class OrderEffects {
     private readonly router: Router,
     private readonly actions$: Actions,
     private readonly appFacade: AppFacade,
-    private readonly organizationFacade: OrganizationFacade,
+    private readonly organizationContextFacade: OrganizationContextFacade,
     private readonly orderService: OrderService,
     private readonly orderFacade: OrderFacade,
     private readonly errorHandlingService: ErrorHandlingService
diff --git a/packages/core/state/src/lib/+state/organization-context/index.ts b/packages/core/state/src/lib/+state/organization-context/index.ts
@@ -0,0 +1,3 @@
+export { OrganizationContextEffects } from './organization-context.effects';
+export { OrganizationContextFacade } from './organization-context.facade';
+export { organizationContextReducer } from './organization-context.reducer';
diff --git a/packages/core/state/src/lib/+state/organization-context/organization-context.effects.ts b/packages/core/state/src/lib/+state/organization-context/organization-context.effects.ts
@@ -23,7 +23,7 @@ import { concatLatestFrom } from '@ngrx/operators';
 import { OrganizationContextFacade } from './organization-context.facade';
 
 @Injectable()
-export class OrganizationEffects {
+export class OrganizationContextEffects {
   // organizationReadRequest$ = createEffect(() => {
   //   return this.actions$.pipe(
   //     ofType(organizationActions.organizationReadRequest),
diff --git a/packages/core/state/src/lib/+state/organization-context/organization-context.reducer.ts b/packages/core/state/src/lib/+state/organization-context/organization-context.reducer.ts
@@ -85,7 +85,7 @@ const reducer = createReducer<IOrganizationContextState>(
   )
 );
 
-export const organizationReducer = (
+export const organizationContextReducer = (
   state: IOrganizationContextState | undefined,
   action: Action
 ) => reducer(state, action);
diff --git a/packages/core/state/src/lib/+state/product/product.effects.ts b/packages/core/state/src/lib/+state/product/product.effects.ts
@@ -24,7 +24,7 @@ import * as productActions from './product.actions';
 import { productReadOneByIdRequest } from './product.actions';
 import { concatLatestFrom } from '@ngrx/operators';
 import {
-  OrganizationFacade,
+  OrganizationContextFacade,
   withLatestOrganizationData,
 } from '@console-core/state';
 
@@ -53,7 +53,7 @@ export class ProductEffects {
     let isLoadMore = false;
     return this.actions$.pipe(
       withLatestOrganizationData(
-        this.organizationFacade,
+        this.organizationContextFacade,
         productActions.productReadRequest.type // Pass only the effect-specific action
       ),
       exhaustMap(([action, organization]) => {
@@ -302,7 +302,7 @@ export class ProductEffects {
     private readonly router: Router,
     private readonly actions$: Actions,
     private readonly appFacade: AppFacade,
-    private readonly organizationFacade: OrganizationFacade,
+    private readonly organizationContextFacade: OrganizationContextFacade,
     private readonly productService: ProductService,
     private readonly errorHandlingService: ErrorHandlingService
   ) {}
diff --git a/packages/core/state/src/lib/core-state.module.ts b/packages/core/state/src/lib/core-state.module.ts
@@ -38,6 +38,9 @@ import {
   OrganizationEffects,
   OrganizationFacade,
   organizationReducer,
+  OrganizationContextEffects,
+  OrganizationContextFacade,
+  organizationContextReducer,
   ProductEffects,
   ProductFacade,
   productReducer,
@@ -73,6 +76,7 @@ const facades = [
   RoleFacade,
   LocaleFacade,
   OrderFacade,
+  OrganizationContextFacade,
   ProductFacade,
   RouterFacade,
   TaxFacade,
@@ -118,6 +122,11 @@ const facades = [
     StoreModule.forFeature(STORE.states.shopState, shopReducer),
     EffectsModule.forFeature([ShopEffects]),
     StoreModule.forFeature(STORE.states.routerState, fromRouter.routerReducer),
+    EffectsModule.forFeature([OrganizationContextEffects]),
+    StoreModule.forFeature(
+      STORE.states.organizationContextState,
+      organizationContextReducer
+    ),
   ],
   providers: [...facades],
 })
diff --git a/packages/core/state/src/lib/utils/with-latest-organization-data.ts b/packages/core/state/src/lib/utils/with-latest-organization-data.ts
@@ -3,30 +3,31 @@ import { concatLatestFrom } from '@ngrx/operators';
 import { Action } from '@ngrx/store';
 import { map, Observable, OperatorFunction } from 'rxjs';
 
-import { OrganizationFacade } from '../+state/management/organization/organization.facade';
-import * as organizationActions from '../+state/organization-context/organization-context.actions';
+import { OrganizationContextFacade } from '../+state';
+import * as organizationContextActions from '../+state/organization-context/organization-context.actions';
 
 export type OrganizationDataTuple = [
   globalOrganizationLeafId: string,
   globalOrganizationId: string
 ];
 
 export function withLatestOrganizationData<T extends Action>(
-  organizationFacade: OrganizationFacade,
+  organizationContextFacade: OrganizationContextFacade,
   ...additionalActionTypes: string[]
 ): OperatorFunction<T, [T, string]> {
   return (source$: Observable<T>) =>
     source$.pipe(
       ofType<T>(
         ...additionalActionTypes,
-        organizationActions.setSelectedGlobalOrganizationId.type,
-        organizationActions.selectedGlobalOrganizationHistory.type,
-        organizationActions.setPreviousSelectedGlobalOrganizationHistory.type,
-        organizationActions.cancelOrganizationContextSelection.type
+        organizationContextActions.setSelectedGlobalOrganizationId.type,
+        organizationContextActions.selectedGlobalOrganizationHistory.type,
+        organizationContextActions.setPreviousSelectedGlobalOrganizationHistory
+          .type,
+        organizationContextActions.cancelOrganizationContextSelection.type
       ),
       concatLatestFrom(() => [
-        organizationFacade.globalOrganizationLeafId$,
-        organizationFacade.globalOrganizationId$,
+        organizationContextFacade.globalOrganizationLeafId$,
+        organizationContextFacade.globalOrganizationId$,
       ]),
       map(([action, organizationLeaf, organization]) => {
         const selectedOrganization = organizationLeaf || organization;
diff --git a/packages/core/types/src/lib/interfaces/store.ts b/packages/core/types/src/lib/interfaces/store.ts
@@ -10,7 +10,8 @@ export interface IStoreConstant {
     readonly invoiceState: 'invoiceStateV1';
     readonly localeState: 'localeStateV1';
     readonly orderState: 'orderStateV1';
-    readonly organizationState: 'organizationStateV3';
+    readonly organizationState: 'organizationStateV4';
+    readonly organizationContextState: 'organizationContextStateV1';
     readonly policyState: 'policyStateV1';
     readonly productState: 'productStateV1';
     readonly roleState: 'roleStateV1';
diff --git a/packages/modules/ui/src/lib/components/organisms/crud/crud-create.component.ts b/packages/modules/ui/src/lib/components/organisms/crud/crud-create.component.ts
@@ -12,7 +12,7 @@ import { combineLatest } from 'rxjs';
 import { JssFormComponent, VCLFormFieldSchemaRoot } from '@vcl/ng-vcl';
 
 import { ModeType } from '@console-core/graphql';
-import { AccountFacade, OrganizationFacade } from '@console-core/state';
+import { AccountFacade, OrganizationContextFacade } from '@console-core/state';
 
 @Component({
   selector: 'rc-crud-create',
@@ -51,13 +51,13 @@ export class RcCrudCreateComponent implements OnInit {
 
   constructor(
     private accountFacade: AccountFacade,
-    private organizationFacade: OrganizationFacade
+    private organizationContextFacade: OrganizationContextFacade
   ) {}
 
   ngOnInit(): void {
     combineLatest([
-      this.organizationFacade.globalOrganizationLeafId$,
-      this.organizationFacade.globalOrganizationId$,
+      this.organizationContextFacade.globalOrganizationLeafId$,
+      this.organizationContextFacade.globalOrganizationId$,
     ]).subscribe(([leafOrganizationId, organizationId]) => {
       this.currentOrganizationId = leafOrganizationId
         ? leafOrganizationId
diff --git a/packages/modules/ui/src/lib/components/organisms/header/header-toolbar.component.html b/packages/modules/ui/src/lib/components/organisms/header/header-toolbar.component.html
diff --git a/packages/modules/ui/src/lib/components/organisms/header/header-toolbar.component.ts b/packages/modules/ui/src/lib/components/organisms/header/header-toolbar.component.ts

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export { OrganizationContextEffects } from './organization-context.effects';`
	`2`	`+export { OrganizationContextFacade } from './organization-context.facade';`
	`3`	`+export { organizationContextReducer } from './organization-context.reducer';`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ const reducer = createReducer<IOrganizationContextState>(`
`85`	`85`	`)`
`86`	`86`	`);`
`87`	`87`
`88`		`-export const organizationReducer = (`
	`88`	`+export const organizationContextReducer = (`
`89`	`89`	`state: IOrganizationContextState \| undefined,`
`90`	`90`	`action: Action`
`91`	`91`	`) => reducer(state, action);`