feat: add organization-managment & remove luigiCoreService

Author: Sobyt483

projects/wc/src/app/components/organization-management/organization-management.component.spec.ts

@@ -9,8 +9,7 @@ import { MutationResult } from '@apollo/client';
 import { LuigiClient } from '@luigi-project/client/luigi-element';
 import {
   ClientEnvironment, EnvConfigService,
-  I18nService,
-  LuigiCoreService, LuigiGlobalContext, NodeContext,
+  I18nService, LuigiGlobalContext, NodeContext,
 } from '@openmfp/portal-ui-lib';
 import { ResourceService } from '@platform-mesh/portal-ui-lib/services';
 import { of, throwError } from 'rxjs';
@@ -21,7 +20,6 @@ describe('OrganizationManagementComponent', () => {
   let fixture: ComponentFixture<OrganizationManagementComponent>;
   let resourceServiceMock: jest.Mocked<ResourceService>;
   let i18nServiceMock: jest.Mocked<I18nService>;
-  let luigiCoreServiceMock: jest.Mocked<LuigiCoreService>;
   let envConfigServiceMock: jest.Mocked<EnvConfigService>;
   let luigiClientMock: jest.Mocked<LuigiClient>;
 
@@ -36,11 +34,6 @@ describe('OrganizationManagementComponent', () => {
       getTranslation: jest.fn(),
     } as any;
 
-    luigiCoreServiceMock = {
-      getGlobalContext: jest.fn(),
-      showAlert: jest.fn(),
-    } as any;
-
     envConfigServiceMock = {
       getEnvConfig: jest.fn(),
     } as any;
@@ -56,7 +49,6 @@ describe('OrganizationManagementComponent', () => {
       providers: [
         { provide: ResourceService, useValue: resourceServiceMock },
         { provide: I18nService, useValue: i18nServiceMock },
-        { provide: LuigiCoreService, useValue: luigiCoreServiceMock },
         { provide: EnvConfigService, useValue: envConfigServiceMock },
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA],
@@ -111,7 +103,8 @@ describe('OrganizationManagementComponent', () => {
       organization: 'org1',
       portalBaseUrl: 'https://test.com',
     };
-    luigiCoreServiceMock.getGlobalContext.mockReturnValue(mockGlobalContext);
+
+    component.context = (() => mockGlobalContext) as any;
     resourceServiceMock.readOrganizations.mockReturnValue(
       of(mockOrganizations as any),
     );
@@ -158,7 +151,7 @@ describe('OrganizationManagementComponent', () => {
 
     component.onboardOrganization();
 
-    expect(luigiCoreServiceMock.showAlert).toHaveBeenCalledWith({
+    expect(component.LuigiClient().uxManager().showAlert).toHaveBeenCalledWith({
       text: 'Failure! Could not create organization: newOrg.',
       type: 'error',
     });

projects/wc/src/app/components/organization-management/organization-management.component.ts

@@ -13,9 +13,8 @@ import { LuigiClient } from '@luigi-project/client/luigi-element';
 import {
   EnvConfigService,
   I18nService,
-  LuigiCoreService,
   Resource,
-  ResourceDefinition,
+  ResourceDefinition
 } from '@openmfp/portal-ui-lib';
 import { ResourceNodeContext, ResourceService } from '@platform-mesh/portal-ui-lib/services';
 import { generateGraphQLFields } from '@platform-mesh/portal-ui-lib/utils';
@@ -47,7 +46,6 @@ import {
 export class OrganizationManagementComponent implements OnInit {
   private i18nService = inject(I18nService);
   private resourceService = inject(ResourceService);
-  private luigiCoreService = inject(LuigiCoreService);
   private envConfigService = inject(EnvConfigService);
   context = input<ResourceNodeContext>();
   LuigiClient = input<LuigiClient>();
@@ -92,7 +90,7 @@ export class OrganizationManagementComponent implements OnInit {
               .map((o) => o.metadata.name)
               .filter(
                 (o) =>
-                  o !== this.luigiCoreService.getGlobalContext().organization,
+                  o !== this.context()['organization']
               ),
           );
         },
@@ -129,7 +127,7 @@ export class OrganizationManagementComponent implements OnInit {
           });
         },
         error: (error) => {
-          this.luigiCoreService.showAlert({
+          this.LuigiClient().uxManager().showAlert({
             text: `Failure! Could not create organization: ${resource.metadata.name}.`,
             type: 'error',
           });
@@ -185,7 +183,7 @@ export class OrganizationManagementComponent implements OnInit {
     const sanitizedOrg = this.sanitizeSubdomainInput(this.organizationToSwitch);
 
     if (!sanitizedOrg) {
-      this.luigiCoreService.showAlert({
+      this.LuigiClient().uxManager().showAlert({
         text: 'Organization name is not valid for subdomain usage, accrording to RFC 1034/1123.',
         type: 'error',
       });

projects/wc/src/app/initializers/luigi-wc-initializer.spec.ts

@@ -1,10 +1,11 @@
-import { ApplicationInitStatus, Injector } from '@angular/core';
+import { ApplicationInitStatus } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 
-import { provideLuigiWebComponents } from './luigi-wc-initializer';
-import { ListViewComponent } from '../components/generic-ui/list-view/list-view.component';
 import { DetailViewComponent } from '../components/generic-ui/detail-view/detail-view.component';
+import { ListViewComponent } from '../components/generic-ui/list-view/list-view.component';
+import { provideLuigiWebComponents } from './luigi-wc-initializer';
 
+import { OrganizationManagementComponent } from '../components/organization-management/organization-management.component';
 import * as wc from '../utils/wc';
 
 describe('provideLuigiWebComponents', () => {
@@ -26,6 +27,7 @@ describe('provideLuigiWebComponents', () => {
     const expectedMap = {
       'generic-list-view': ListViewComponent,
       'generic-detail-view': DetailViewComponent,
+      'organization-management': OrganizationManagementComponent,
     } as Record<string, any>;
 
     // Validate first arg equals the components map

projects/wc/src/app/initializers/luigi-wc-initializer.ts

@@ -1,6 +1,7 @@
 import { Injector, inject, provideAppInitializer } from '@angular/core';
 import { DetailViewComponent } from '../components/generic-ui/detail-view/detail-view.component';
 import { ListViewComponent } from '../components/generic-ui/list-view/list-view.component';
+import { OrganizationManagementComponent } from '../components/organization-management/organization-management.component';
 import { registerLuigiWebComponents } from '../utils/wc';
 
 export const provideLuigiWebComponents = () =>
@@ -10,6 +11,7 @@ export const provideLuigiWebComponents = () =>
       {
         'generic-list-view': ListViewComponent,
         'generic-detail-view': DetailViewComponent,
+        'organization-management': OrganizationManagementComponent,
       },
       injector,
     );