From dfcfdbbe06145d3c60a7c951deb13ed040beb302 Mon Sep 17 00:00:00 2001 From: Simone Camito Date: Tue, 19 Nov 2024 15:01:02 +0100 Subject: [PATCH] add missing isDelegable prop --- packages/api-clients/open-api/apiGatewayApi.yml | 2 ++ packages/api-clients/open-api/bffApi.yml | 10 ++++++++++ packages/api-gateway/src/services/catalogService.ts | 1 + .../src/api/catalogApiConverter.ts | 2 ++ packages/backend-for-frontend/src/model/types.ts | 1 + .../src/services/catalogService.ts | 2 ++ .../backend-for-frontend/src/utilities/fileUtils.ts | 1 + 7 files changed, 19 insertions(+) diff --git a/packages/api-clients/open-api/apiGatewayApi.yml b/packages/api-clients/open-api/apiGatewayApi.yml index 299022dad9..414548b461 100644 --- a/packages/api-clients/open-api/apiGatewayApi.yml +++ b/packages/api-clients/open-api/apiGatewayApi.yml @@ -2619,6 +2619,8 @@ components: type: string isSignalHubEnabled: type: boolean + isDelegable: + type: boolean EServiceAttributes: description: the attributes set associated to the EService properties: diff --git a/packages/api-clients/open-api/bffApi.yml b/packages/api-clients/open-api/bffApi.yml index 5b8c78fe63..d2345409d5 100644 --- a/packages/api-clients/open-api/bffApi.yml +++ b/packages/api-clients/open-api/bffApi.yml @@ -12973,6 +12973,8 @@ components: $ref: "#/components/schemas/EServiceMode" isSignalHubEnabled: type: boolean + isDelegable: + type: boolean EServiceSeed: type: object additionalProperties: false @@ -12992,6 +12994,8 @@ components: $ref: "#/components/schemas/EServiceMode" isSignalHubEnabled: type: boolean + isDelegable: + type: boolean UpdateEServiceDescriptorQuotas: required: - voucherLifespan @@ -13239,6 +13243,8 @@ components: $ref: "#/components/schemas/Mail" isSignalHubEnabled: type: boolean + isDelegable: + type: boolean ProducerEServiceDetails: type: object additionalProperties: false @@ -13267,6 +13273,8 @@ components: $ref: "#/components/schemas/EServiceRiskAnalysis" isSignalHubEnabled: type: boolean + isDelegable: + type: boolean EServiceMode: type: string description: Risk Analysis Mode @@ -13394,6 +13402,8 @@ components: $ref: "#/components/schemas/Mail" isSignalHubEnabled: type: boolean + isDelegable: + type: boolean EServiceDoc: type: object additionalProperties: false diff --git a/packages/api-gateway/src/services/catalogService.ts b/packages/api-gateway/src/services/catalogService.ts index 08fd23d14d..8765e5e934 100644 --- a/packages/api-gateway/src/services/catalogService.ts +++ b/packages/api-gateway/src/services/catalogService.ts @@ -255,5 +255,6 @@ export async function enhanceEservice( serverUrls: latestNonDraftDescriptor.serverUrls, producer: producerOrganization, isSignalHubEnabled: eservice.isSignalHubEnabled, + isDelegable: eservice.isDelegable, }; } diff --git a/packages/backend-for-frontend/src/api/catalogApiConverter.ts b/packages/backend-for-frontend/src/api/catalogApiConverter.ts index a04d60189f..af0c8f6df3 100644 --- a/packages/backend-for-frontend/src/api/catalogApiConverter.ts +++ b/packages/backend-for-frontend/src/api/catalogApiConverter.ts @@ -119,6 +119,7 @@ export function toBffCatalogDescriptorEService( toBffCatalogApiEserviceRiskAnalysis ), isSignalHubEnabled: eservice.isSignalHubEnabled, + isDelegable: eservice.isDelegable, }; } @@ -265,6 +266,7 @@ export function toBffCatalogApiProducerDescriptorEService( ), descriptors: notDraftDecriptors, isSignalHubEnabled: eservice.isSignalHubEnabled, + isDelegable: eservice.isDelegable, }; } diff --git a/packages/backend-for-frontend/src/model/types.ts b/packages/backend-for-frontend/src/model/types.ts index ca16209444..5440dcff86 100644 --- a/packages/backend-for-frontend/src/model/types.ts +++ b/packages/backend-for-frontend/src/model/types.ts @@ -208,5 +208,6 @@ export const ConfigurationEservice = z.object({ descriptor: ConfigurationDescriptor, riskAnalysis: z.array(ConfigurationRiskAnalysis), isSignalHubEnabled: z.boolean().optional(), + isDelegable: z.boolean().optional(), }); export type ConfigurationEservice = z.infer; diff --git a/packages/backend-for-frontend/src/services/catalogService.ts b/packages/backend-for-frontend/src/services/catalogService.ts index 468a8d66dd..a33f8a9e24 100644 --- a/packages/backend-for-frontend/src/services/catalogService.ts +++ b/packages/backend-for-frontend/src/services/catalogService.ts @@ -326,6 +326,7 @@ export function catalogServiceBuilder( toBffCatalogApiEserviceRiskAnalysis ), isSignalHubEnabled: eservice.isSignalHubEnabled, + isDelegable: eservice.isDelegable, }; }, updateEServiceDescription: async ( @@ -1131,6 +1132,7 @@ export function catalogServiceBuilder( importedEservice.descriptor.agreementApprovalPolicy, }, isSignalHubEnabled: importedEservice.isSignalHubEnabled, + isDelegable: importedEservice.isDelegable, }; const pollEServiceById = createPollingByCondition(() => diff --git a/packages/backend-for-frontend/src/utilities/fileUtils.ts b/packages/backend-for-frontend/src/utilities/fileUtils.ts index a9a3fde57e..c5fe21a36d 100644 --- a/packages/backend-for-frontend/src/utilities/fileUtils.ts +++ b/packages/backend-for-frontend/src/utilities/fileUtils.ts @@ -81,6 +81,7 @@ export function buildJsonConfig( technology: eservice.technology, mode: eservice.mode, isSignalHubEnabled: eservice.isSignalHubEnabled, + isDelegable: eservice.isDelegable, descriptor: { interface: descriptor.interface && { prettyName: descriptor.interface.prettyName,