diff --git a/src/portal-options/service-providers/content-configuration-service-providers.service.spec.ts b/src/portal-options/service-providers/content-configuration-service-providers.service.spec.ts index f286637..fccaf30 100644 --- a/src/portal-options/service-providers/content-configuration-service-providers.service.spec.ts +++ b/src/portal-options/service-providers/content-configuration-service-providers.service.spec.ts @@ -43,12 +43,12 @@ describe('ContentConfigurationServiceProvidersService', () => { it('returns parsed content configurations', async () => { mockClient.request.mockResolvedValue({ - core_openmfp_io: { + ui_platform_mesh_io: { ContentConfigurations: [ { metadata: { name: 'conf1', - labels: { 'portal.openmfp.org/entity': 'entity' }, + labels: { 'ui.platform-mesh.io/entity': 'entity' }, }, spec: { remoteConfiguration: { url: 'http://remote' } }, status: { @@ -70,12 +70,12 @@ describe('ContentConfigurationServiceProvidersService', () => { it('falls back to spec.remoteConfiguration.url if missing in parsed config', async () => { mockClient.request.mockResolvedValue({ - core_openmfp_io: { + ui_platform_mesh_io: { ContentConfigurations: [ { metadata: { name: 'conf1', - labels: { 'portal.openmfp.org/entity': 'entity' }, + labels: { 'ui.platform-mesh.io/entity': 'entity' }, }, spec: { remoteConfiguration: { url: 'http://remote' } }, status: { configurationResult: JSON.stringify({}) }, @@ -95,12 +95,12 @@ describe('ContentConfigurationServiceProvidersService', () => { it('throws on missing configurationResult', async () => { mockClient.request.mockResolvedValue({ - core_openmfp_io: { + ui_platform_mesh_io: { ContentConfigurations: [ { metadata: { name: 'conf1', - labels: { 'portal.openmfp.org/entity': 'entity' }, + labels: { 'ui.platform-mesh.io/entity': 'entity' }, }, spec: { remoteConfiguration: { url: 'http://remote' } }, status: {}, diff --git a/src/portal-options/service-providers/content-configuration-service-providers.service.ts b/src/portal-options/service-providers/content-configuration-service-providers.service.ts index 32203eb..360319b 100644 --- a/src/portal-options/service-providers/content-configuration-service-providers.service.ts +++ b/src/portal-options/service-providers/content-configuration-service-providers.service.ts @@ -9,7 +9,7 @@ import { GraphQLClient, gql } from 'graphql-request'; export const contentConfigurationsQuery = gql` query { - core_openmfp_io { + ui_platform_mesh_io { ContentConfigurations { metadata { name @@ -66,7 +66,7 @@ export class ContentConfigurationServiceProvidersService ); // Validate response structure - if (!response?.core_openmfp_io?.ContentConfigurations) { + if (!response?.ui_platform_mesh_io?.ContentConfigurations) { throw new Error( 'Invalid response structure: missing ContentConfigurations', ); @@ -74,9 +74,9 @@ export class ContentConfigurationServiceProvidersService const entity = !entities || !entities.length ? 'main' : entities[0]; const contentConfigurations = - response.core_openmfp_io.ContentConfigurations.filter( + response.ui_platform_mesh_io.ContentConfigurations.filter( (item) => - item.metadata.labels?.['portal.openmfp.org/entity'] === entity, + item.metadata.labels?.['ui.platform-mesh.io/entity'] === entity, ).map((item) => { try { // Validate required fields diff --git a/src/portal-options/service-providers/kubernetes-service-providers.service.ts b/src/portal-options/service-providers/kubernetes-service-providers.service.ts index f5ebfee..9d79ef7 100644 --- a/src/portal-options/service-providers/kubernetes-service-providers.service.ts +++ b/src/portal-options/service-providers/kubernetes-service-providers.service.ts @@ -79,7 +79,7 @@ export class KubernetesServiceProvidersService group: 'core.openmfp.io', version: 'v1alpha1', plural: 'contentconfigurations', - labelSelector: `portal.openmfp.org/entity=${entity}`, + labelSelector: `ui.platform-mesh.io/entity=${entity}`, }; return await this.k8sApi.listClusterCustomObject(gvr, { middleware: [ diff --git a/src/portal-options/service-providers/models/contentconfigurations.ts b/src/portal-options/service-providers/models/contentconfigurations.ts index 103d391..6388c82 100644 --- a/src/portal-options/service-providers/models/contentconfigurations.ts +++ b/src/portal-options/service-providers/models/contentconfigurations.ts @@ -1,5 +1,5 @@ export interface ContentConfigurationQueryResponse { - core_openmfp_io: ContentConfigurationsResponse; + ui_platform_mesh_io: ContentConfigurationsResponse; } export interface ContentConfigurationsResponse {