diff --git a/kraken-app/kraken-app-controller/src/main/resources/application.yaml b/kraken-app/kraken-app-controller/src/main/resources/application.yaml index 416d3dac5..0ed1f105c 100644 --- a/kraken-app/kraken-app-controller/src/main/resources/application.yaml +++ b/kraken-app/kraken-app-controller/src/main/resources/application.yaml @@ -25,6 +25,7 @@ spring: description: "@project.name@" build: version: "@project.version@" + api-spec-version: Haley jackson: default-property-inclusion: NON_NULL deserialization: diff --git a/kraken-app/kraken-app-portal/src/pages/HomePage/components/ApiComponent.tsx b/kraken-app/kraken-app-portal/src/pages/HomePage/components/ApiComponent.tsx index ae2e1c226..48133999f 100644 --- a/kraken-app/kraken-app-portal/src/pages/HomePage/components/ApiComponent.tsx +++ b/kraken-app/kraken-app-portal/src/pages/HomePage/components/ApiComponent.tsx @@ -99,10 +99,12 @@ const ApiComponent = ({ - {Object.keys(item.labels).map((l) => { + {Object.keys(item.labels) + .filter((key) => key !== "mef-api-release" && key !== "parentProductType") + .map((k) => { return ( - - {item.labels[l]} + + {item.labels[k]} ); })} diff --git a/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/commonHook.tsx b/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/commonHook.tsx index 210c6f8ec..abf3193f5 100644 --- a/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/commonHook.tsx +++ b/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/commonHook.tsx @@ -40,7 +40,6 @@ export const useCommonAddProp = ({ useNewApiMappingStore(); const [currentProp, setCurrentProp] = useState>(); const { value: isOpen, setTrue: open, setFalse: close } = useBoolean(false); - const handleAddProp = useCallback(() => { if (!selectedProp) { notification.error({ message: "Please select one property!" }); diff --git a/kraken-java-sdk/kraken-java-sdk-controller/src/main/java/com/consoleconnect/kraken/operator/controller/service/SystemInfoService.java b/kraken-java-sdk/kraken-java-sdk-controller/src/main/java/com/consoleconnect/kraken/operator/controller/service/SystemInfoService.java index 535a1c5e6..1c56008b8 100644 --- a/kraken-java-sdk/kraken-java-sdk-controller/src/main/java/com/consoleconnect/kraken/operator/controller/service/SystemInfoService.java +++ b/kraken-java-sdk/kraken-java-sdk-controller/src/main/java/com/consoleconnect/kraken/operator/controller/service/SystemInfoService.java @@ -51,24 +51,20 @@ public class SystemInfoService { @Value("${spring.build.version}") private String buildVersion; + @Value("${spring.build.api-spec-version:Haley}") + private String apiSpecVersion; + @EventListener(PlatformSettingCompletedEvent.class) @Transactional @Async public void initialize() { - List list = unifiedAssetService.findByKind(AssetKindEnum.PRODUCT.getKind()); String productKey = Optional.ofNullable(list.get(0)) .map(UnifiedAssetDto::getMetadata) .map(Metadata::getKey) .orElse(null); - String productSpec = - Optional.ofNullable(list.get(0)) - .map(UnifiedAssetDto::getMetadata) - .map(Metadata::getLabels) - .map(t -> t.get(LabelConstants.MEF_API_RELEASE)) - .orElse(null); - + String productSpec = apiSpecVersion; systemInfoRepository .findOneByKey(KEY) .or( diff --git a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/product.yaml b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/product.yaml index dd30a8cc9..30f720b46 100644 --- a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/product.yaml +++ b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/product.yaml @@ -203,7 +203,4 @@ spec: - classpath:/mef-sonata/api-targets-mappers-sample-data/api-target-mapper.order.uni.add.yaml sampleConfigPaths: - classpath:/mef-sonata/api-targets-mappers-sample-data/api-target-spec.mock.yaml - - classpath:/mef-sonata/api-targets-mappers-sample-data/api.buyer.mock.yaml - - - + - classpath:/mef-sonata/api-targets-mappers-sample-data/api.buyer.mock.yaml \ No newline at end of file