Merge branch 'main' into jarek/kraken-31_v2

mycloudnexus · Nov 19, 2024 · 52e0911 · 52e0911
2 parents e971e8a + 8391627
commit 52e0911
Show file tree

Hide file tree

Showing 17 changed files with 61 additions and 60 deletions.
diff --git a/kraken-app/kraken-app-agent/pom.xml b/kraken-app/kraken-app-agent/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kraken-app-agent</artifactId>
     <name>kraken-app-agent</name>
-    <version>1.0.0-snapshot</version>
+    <version>2.0.0-snapshot.0</version>
     <packaging>jar</packaging>
     <parent>
         <groupId>com.consoleconnect.kraken</groupId>
         <artifactId>kraken-app</artifactId>
-        <version>1.0.0-snapshot</version>
+        <version>2.0.0-snapshot.0</version>
     </parent>
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>

diff --git a/kraken-app/kraken-app-controller/pom.xml b/kraken-app/kraken-app-controller/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kraken-app-controller</artifactId>
     <name>kraken-app-controller</name>
-    <version>1.0.0-snapshot</version>
+    <version>2.0.0-snapshot.0</version>
     <packaging>jar</packaging>
     <parent>
         <groupId>com.consoleconnect.kraken</groupId>
         <artifactId>kraken-app</artifactId>
-        <version>1.0.0-snapshot</version>
+        <version>2.0.0-snapshot.0</version>
     </parent>
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>

diff --git a/kraken-app/kraken-app-hub/pom.xml b/kraken-app/kraken-app-hub/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kraken-app-hub</artifactId>
     <name>kraken-app-hub</name>
-    <version>1.0.0-snapshot</version>
+    <version>2.0.0-snapshot.0</version>
     <packaging>jar</packaging>
     <parent>
         <groupId>com.consoleconnect.kraken</groupId>
         <artifactId>kraken-app</artifactId>
-        <version>1.0.0-snapshot</version>
+        <version>2.0.0-snapshot.0</version>
     </parent>
 
     <properties>
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.consoleconnect.kraken</groupId>
             <artifactId>kraken-java-sdk-gateway</artifactId>
-            <version>1.0.0-snapshot</version>
+            <version>2.0.0-snapshot.0</version>
         </dependency>
 
     </dependencies>

diff --git a/kraken-app/kraken-app-portal/package-lock.json b/kraken-app/kraken-app-portal/package-lock.json
diff --git a/kraken-app/kraken-app-portal/package.json b/kraken-app/kraken-app-portal/package.json
@@ -1,7 +1,7 @@
 {
   "name": "kraken-app-portal",
   "private": true,
-  "version": "1.0.0-snapshot",
+  "version": "2.0.0-snapshot.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -102,6 +102,7 @@
     "@esbuild/win32-ia32": "^0.24.0",
     "@esbuild/win32-x64": "^0.24.0",
     "@esbuild/aix-ppc64": "^0.24.0",
-    "fsevents": "2.3.2"
+    "fsevents": "2.3.2",
+    "cross-spawn": "7.0.5"
   }
 }
diff --git a/kraken-app/kraken-app-portal/src/pages/APIServerList/components/APIServerCard.tsx b/kraken-app/kraken-app-portal/src/pages/APIServerList/components/APIServerCard.tsx
@@ -86,27 +86,27 @@ const APIServerCard = ({ item, refetchList }: Props) => {
         style={{ borderRadius: 4, width: "100%" }}
         title={
           <Flex justify="space-between" gap={12} align="center">
-            <Flex gap={8}>
+            <Flex gap={8} align="center">
               <Text.NormalLarge>
                 {get(item, "metadata.name", "")}
               </Text.NormalLarge>
-              <div onMouseEnter={trueHover} onMouseLeave={falseHover}>
+              <Flex onMouseEnter={trueHover} onMouseLeave={falseHover}>
                 {isHover && isApiInUse ? (
                   <Button
-                    style={{ padding: "0px" }}
+                    style={{ padding: "5px 0" }}
                     type="link"
                     onClick={() => setOpenMappingDrawer(true)}
                   >
                     Check details
                   </Button>
                 ) : (
-                  <Tag color={isApiInUse ? "blue" : ""} >
+                  <Tag color={isApiInUse ? "blue" : ""}>
                     <Text.LightSmall>
                       {isApiInUse ? "In use" : "Not in use"}
                     </Text.LightSmall>
                   </Tag>
                 )}
-              </div>
+              </Flex>
             </Flex>
             <Flex>
               <Button type="link" onClick={handleEdit}>

diff --git a/kraken-app/pom.xml b/kraken-app/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kraken-app</artifactId>
     <name>kraken-app</name>
-    <version>1.0.0-snapshot</version>
+    <version>2.0.0-snapshot.0</version>
     <packaging>pom</packaging>
     <parent>
         <groupId>com.consoleconnect.kraken</groupId>
         <artifactId>kraken-platform</artifactId>
-        <version>1.0.0-snapshot</version>
+        <version>2.0.0-snapshot.0</version>
     </parent>
 
 
@@ -40,42 +40,42 @@
             <dependency>
                 <groupId>com.consoleconnect.kraken</groupId>
                 <artifactId>kraken-java-sdk-core</artifactId>
-                <version>1.0.0-snapshot</version>
+                <version>2.0.0-snapshot.0</version>
             </dependency>
             <dependency>
                 <groupId>com.consoleconnect.kraken</groupId>
                 <artifactId>kraken-java-sdk-data</artifactId>
-                <version>1.0.0-snapshot</version>
+                <version>2.0.0-snapshot.0</version>
             </dependency>
             <dependency>
                 <groupId>com.consoleconnect.kraken</groupId>
                 <artifactId>kraken-java-sdk-sync</artifactId>
-                <version>1.0.0-snapshot</version>
+                <version>2.0.0-snapshot.0</version>
             </dependency>
             <dependency>
                 <groupId>com.consoleconnect.kraken</groupId>
                 <artifactId>kraken-java-sdk-gateway</artifactId>
-                <version>1.0.0-snapshot</version>
+                <version>2.0.0-snapshot.0</version>
             </dependency>
             <dependency>
                 <groupId>com.consoleconnect.kraken</groupId>
                 <artifactId>kraken-java-sdk-controller</artifactId>
-                <version>1.0.0-snapshot</version>
+                <version>2.0.0-snapshot.0</version>
             </dependency>
             <dependency>
                 <groupId>com.consoleconnect.kraken</groupId>
                 <artifactId>kraken-java-sdk-mef</artifactId>
-                <version>1.0.0-snapshot</version>
+                <version>2.0.0-snapshot.0</version>
             </dependency>
             <dependency>
                 <groupId>com.consoleconnect.kraken</groupId>
                 <artifactId>kraken-java-sdk-test</artifactId>
-                <version>1.0.0-snapshot</version>
+                <version>2.0.0-snapshot.0</version>
             </dependency>
             <dependency>
                 <groupId>com.consoleconnect.kraken</groupId>
                 <artifactId>kraken-java-sdk-auth</artifactId>
-                <version>1.0.0-snapshot</version>
+                <version>2.0.0-snapshot.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/kraken-java-sdk/kraken-java-sdk-auth/pom.xml b/kraken-java-sdk/kraken-java-sdk-auth/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <groupId>com.consoleconnect.kraken</groupId>
         <artifactId>kraken-java-sdk</artifactId>
-        <version>1.0.0-snapshot</version>
+        <version>2.0.0-snapshot.0</version>
     </parent>
     <artifactId>kraken-java-sdk-auth</artifactId>
     <name>kraken-java-sdk-auth</name>
-    <version>1.0.0-snapshot</version>
+    <version>2.0.0-snapshot.0</version>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>com.consoleconnect.kraken</groupId>
             <artifactId>kraken-java-sdk-core</artifactId>
-            <version>1.0.0-snapshot</version>
+            <version>2.0.0-snapshot.0</version>
         </dependency>
         <!-- test -->
         <dependency>
             <groupId>com.consoleconnect.kraken</groupId>
             <artifactId>kraken-java-sdk-test</artifactId>
-            <version>1.0.0-snapshot</version>
+            <version>2.0.0-snapshot.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/kraken-java-sdk/kraken-java-sdk-controller/pom.xml b/kraken-java-sdk/kraken-java-sdk-controller/pom.xml
@@ -5,26 +5,26 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kraken-java-sdk-controller</artifactId>
     <name>kraken-java-sdk-controller</name>
-    <version>1.0.0-snapshot</version>
+    <version>2.0.0-snapshot.0</version>
     <packaging>jar</packaging>
     <parent>
         <groupId>com.consoleconnect.kraken</groupId>
         <artifactId>kraken-java-sdk</artifactId>
-        <version>1.0.0-snapshot</version>
+        <version>2.0.0-snapshot.0</version>
     </parent>
 
     <dependencies>
 
         <dependency>
             <groupId>com.consoleconnect.kraken</groupId>
             <artifactId>kraken-java-sdk-core</artifactId>
-            <version>1.0.0-snapshot</version>
+            <version>2.0.0-snapshot.0</version>
         </dependency>
 
         <dependency>
             <groupId>com.consoleconnect.kraken</groupId>
             <artifactId>kraken-java-sdk-auth</artifactId>
-            <version>1.0.0-snapshot</version>
+            <version>2.0.0-snapshot.0</version>
         </dependency>
 
         <dependency>
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>com.consoleconnect.kraken</groupId>
             <artifactId>kraken-java-sdk-test</artifactId>
-            <version>1.0.0-snapshot</version>
+            <version>2.0.0-snapshot.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/kraken-java-sdk/kraken-java-sdk-core/pom.xml b/kraken-java-sdk/kraken-java-sdk-core/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kraken-java-sdk-core</artifactId>
     <name>kraken-java-sdk-core</name>
-    <version>1.0.0-snapshot</version>
+    <version>2.0.0-snapshot.0</version>
     <packaging>jar</packaging>
     <parent>
         <groupId>com.consoleconnect.kraken</groupId>
         <artifactId>kraken-java-sdk</artifactId>
-        <version>1.0.0-snapshot</version>
+        <version>2.0.0-snapshot.0</version>
     </parent>
 
     <dependencies>
@@ -155,7 +155,7 @@
         <dependency>
             <groupId>com.consoleconnect.kraken</groupId>
             <artifactId>kraken-java-sdk-test</artifactId>
-            <version>1.0.0-snapshot</version>
+            <version>2.0.0-snapshot.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/kraken-java-sdk/kraken-java-sdk-data/pom.xml b/kraken-java-sdk/kraken-java-sdk-data/pom.xml
@@ -5,23 +5,23 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kraken-java-sdk-data</artifactId>
     <name>kraken-java-sdk-data</name>
-    <version>1.0.0-snapshot</version>
+    <version>2.0.0-snapshot.0</version>
     <packaging>jar</packaging>
     <parent>
         <groupId>com.consoleconnect.kraken</groupId>
         <artifactId>kraken-java-sdk</artifactId>
-        <version>1.0.0-snapshot</version>
+        <version>2.0.0-snapshot.0</version>
     </parent>
     <dependencies>
         <dependency>
             <groupId>com.consoleconnect.kraken</groupId>
             <artifactId>kraken-java-sdk-core</artifactId>
-            <version>1.0.0-snapshot</version>
+            <version>2.0.0-snapshot.0</version>
         </dependency>
         <dependency>
             <groupId>com.consoleconnect.kraken</groupId>
             <artifactId>kraken-java-sdk-test</artifactId>
-            <version>1.0.0-snapshot</version>
+            <version>2.0.0-snapshot.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/kraken-java-sdk/kraken-java-sdk-gateway/pom.xml b/kraken-java-sdk/kraken-java-sdk-gateway/pom.xml
@@ -5,26 +5,26 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kraken-java-sdk-gateway</artifactId>
     <name>kraken-java-sdk-gateway</name>
-    <version>1.0.0-snapshot</version>
+    <version>2.0.0-snapshot.0</version>
     <packaging>jar</packaging>
     <parent>
         <groupId>com.consoleconnect.kraken</groupId>
         <artifactId>kraken-java-sdk</artifactId>
-        <version>1.0.0-snapshot</version>
+        <version>2.0.0-snapshot.0</version>
     </parent>
 
     <dependencies>
 
         <dependency>
             <groupId>com.consoleconnect.kraken</groupId>
             <artifactId>kraken-java-sdk-data</artifactId>
-            <version>1.0.0-snapshot</version>
+            <version>2.0.0-snapshot.0</version>
         </dependency>
 
         <dependency>
             <groupId>com.consoleconnect.kraken</groupId>
             <artifactId>kraken-java-sdk-auth</artifactId>
-            <version>1.0.0-snapshot</version>
+            <version>2.0.0-snapshot.0</version>
         </dependency>
 
         <!-- spring cloud gateway -->
@@ -94,7 +94,7 @@
             <groupId>com.consoleconnect.kraken</groupId>
             <artifactId>kraken-java-sdk-test</artifactId>
             <scope>test</scope>
-            <version>1.0.0-snapshot</version>
+            <version>2.0.0-snapshot.0</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/kraken-java-sdk/kraken-java-sdk-mef/pom.xml b/kraken-java-sdk/kraken-java-sdk-mef/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kraken-java-sdk-mef</artifactId>
     <name>kraken-java-sdk-mef</name>
-    <version>1.0.0-snapshot</version>
+    <version>2.0.0-snapshot.0</version>
     <packaging>jar</packaging>
     <parent>
         <groupId>com.consoleconnect.kraken</groupId>
         <artifactId>kraken-java-sdk</artifactId>
-        <version>1.0.0-snapshot</version>
+        <version>2.0.0-snapshot.0</version>
     </parent>
 
     <dependencies>