Merge branch 'main' into zywang/fix/seller-api-api-use-case-error

mycloudnexus · Nov 15, 2024 · c4002fc · c4002fc
2 parents 70680e5 + f8a2876
commit c4002fc
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 6 deletions.
diff --git a/kraken-app/kraken-app-portal/src/pages/HomePage/components/ActivityDiagrams/index.tsx b/kraken-app/kraken-app-portal/src/pages/HomePage/components/ActivityDiagrams/index.tsx
@@ -21,6 +21,7 @@ import ApiActivityDiagram from "./ApiActivityDiagram";
 import ErrorBrakedownDiagram from "./ErrorDiagram";
 import MostPopularEndpoints from "./MostPopularEndpoints";
 import styles from "./index.module.scss";
+import { capitalize } from 'lodash';
 
 export type DiagramProps = {
   envId: string;
@@ -77,7 +78,7 @@ const DiagramWrapper = ({ envs }: Props) => {
     return (
       envs?.map((env) => ({
         value: env.id,
-        label: env.name,
+        label: capitalize(env.name),
       })) ?? []
     );
   }, [envs]);

diff --git a/kraken-app/kraken-app-portal/src/pages/HomePage/components/QuickStartGuide/index.tsx b/kraken-app/kraken-app-portal/src/pages/HomePage/components/QuickStartGuide/index.tsx
@@ -112,7 +112,9 @@ const QuickStartGuide = () => {
                             goal as keyof (typeof quickStartGuideData)[keyof IQuickStartGuideObject]
                           ] ? (
                             <Flex key={goal} gap={10}>
-                              <CheckFilled />
+                              <div className={styles.iconContainer}>
+                                <CheckFilled />
+                              </div>
                               <Text.LightMedium>
                                 {i.goals[goal as keyof typeof i.goals]}
                               </Text.LightMedium>

diff --git a/kraken-app/kraken-app-portal/src/pages/HomePage/components/index.module.scss b/kraken-app/kraken-app-portal/src/pages/HomePage/components/index.module.scss
@@ -4,6 +4,10 @@
   border-radius: 8px;
 }
 
+.iconContainer {
+  width: 20px;
+}
+
 .guideContainer {
   justify-content: center;
   align-items: center;

diff --git a/...n/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.eline.read.delete.yaml b/...n/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.eline.read.delete.yaml
@@ -82,7 +82,7 @@ spec:
             targetLocation: "BODY"
             requiredMapping: false
           - name: mapper.order.eline.read.delete.productOrderItem.expectedCompleteDate
-            title: "order item complete date"
+            title: "order item expected complete date"
             description: ""
             source: ""
             sourceLocation: "BODY"

diff --git a/...src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.eline.read.yaml b/...src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.eline.read.yaml
@@ -83,7 +83,7 @@ spec:
             targetLocation: "BODY"
             requiredMapping: false
           - name: mapper.order.eline.read.productOrderItem.expectedCompleteDate
-            title: "order item complete date"
+            title: "order item expected complete date"
             description: ""
             source: ""
             sourceLocation: "BODY"

diff --git a/...ain/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.uni.read.delete.yaml b/...ain/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.uni.read.delete.yaml
@@ -83,7 +83,7 @@ spec:
             targetLocation: "BODY"
             requiredMapping: false
           - name: mapper.order.uni.read.delete.productOrderItem.expectedCompleteDate
-            title: "order item complete date"
+            title: "order item expected complete date"
             description: ""
             source: ""
             sourceLocation: "BODY"

diff --git a/...f/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.uni.read.yaml b/...f/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.uni.read.yaml
@@ -84,7 +84,7 @@ spec:
             targetLocation: "BODY"
             requiredMapping: false
           - name: mapper.order.uni.read.productOrderItem.expectedCompleteDate
-            title: "order item complete date"
+            title: "order item expected complete date"
             description: ""
             source: ""
             sourceLocation: "BODY"

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
@@ -103,6 +103,7 @@ spec:
     - classpath:/mef-sonata/template-upgrade/release.1.5.11.yaml
     - classpath:/mef-sonata/template-upgrade/release.1.5.12.yaml
     - classpath:/mef-sonata/template-upgrade/release.1.5.13.yaml
+    - classpath:/mef-sonata/template-upgrade/release.1.5.14.yaml
 
 
   templateUpgradePaths:

diff --git a/...dk/kraken-java-sdk-mef/src/main/resources/mef-sonata/template-upgrade/release.1.5.14.yaml b/...dk/kraken-java-sdk-mef/src/main/resources/mef-sonata/template-upgrade/release.1.5.14.yaml
@@ -0,0 +1,13 @@
+---
+kind: kraken.product.template-upgrade
+apiVersion: v1
+metadata:
+  key: kraken.product.template-upgrade.1.5.14
+  name: V1.5.14
+  labels:
+    productSpec: grace
+    productVersion: V1.5.14
+    publishDate: 2024-11-15 13:11
+  description: |
+    fix expectedCompletionDate title
+  version: 2