This is an automated email from the ASF dual-hosted git repository.
mchades pushed a commit to branch branch-0.7
in repository https://gitbox.apache.org/repos/asf/gravitino.git
The following commit(s) were added to refs/heads/branch-0.7 by this push:
new 33ad42ada [#5270] UI(oceanbase-catalog): Support OceanBase-CE JDBC
catalog on the Web UI (#5334)
33ad42ada is described below
commit 33ad42adab20cd9c199acff30fa25565797a31d2
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Oct 29 17:35:25 2024 +0800
[#5270] UI(oceanbase-catalog): Support OceanBase-CE JDBC catalog on the Web
UI (#5334)
### What changes were proposed in this pull request?
Support OceanBase-CE JDBC catalog on the Web UI
<img width="636" alt="image"
src="https://github.com/user-attachments/assets/330ab1a1-1614-4b90-b6c3-d29f86d4fd45";>
### Why are the changes needed?
N/A
Fix: #5270
### Does this PR introduce _any_ user-facing change?
N/A
### How was this patch tested?
N/A
Co-authored-by: Qian Xia <[email protected]>
Co-authored-by: yuanoOo <[email protected]>
---
web/web/src/app/metalakes/metalake/MetalakeTree.js | 2 ++
web/web/src/lib/icons/iconify-icons.css | 5 ++++
web/web/src/lib/icons/svg/oceanbase.svg | 18 ++++++++++++++
web/web/src/lib/utils/initial.js | 28 ++++++++++++++++++++++
4 files changed, 53 insertions(+)
diff --git a/web/web/src/app/metalakes/metalake/MetalakeTree.js
b/web/web/src/app/metalakes/metalake/MetalakeTree.js
index 9f17480df..e6b6ea0c3 100644
--- a/web/web/src/app/metalakes/metalake/MetalakeTree.js
+++ b/web/web/src/app/metalakes/metalake/MetalakeTree.js
@@ -72,6 +72,8 @@ const MetalakeTree = props => {
return 'custom-icons-paimon'
case 'lakehouse-hudi':
return 'custom-icons-hudi'
+ case 'jdbc-oceanbase':
+ return 'custom-icons-oceanbase'
default:
return 'bx:book'
}
diff --git a/web/web/src/lib/icons/iconify-icons.css
b/web/web/src/lib/icons/iconify-icons.css
index 465c98809..cb1c5b438 100644
--- a/web/web/src/lib/icons/iconify-icons.css
+++ b/web/web/src/lib/icons/iconify-icons.css
@@ -20,6 +20,7 @@
.custom-icons-doris,
.custom-icons-hive,
.custom-icons-hudi,
+.custom-icons-oceanbase,
.custom-icons-paimon {
display: inline-block;
width: 1em;
@@ -41,6 +42,10 @@
background-image: url("data:image/svg+xml,%3Csvg
xmlns='http://www.w3.org/2000/svg' viewBox='0 0 2000 2000' width='2000'
height='2000'%3E%3Cpath fill='transparent' d='M0 1000V0h2000v2000H0zm1529
553c0-5-102-212-227-461l-228-453-22 46c-20 42-25 45-60
45h-38l-54-110c-30-61-57-110-60-110-4 0-470 924-470 933 0 1 59 1
130-1l130-4v41c0 23-5 51-10 62-11 19-2 19 450 19 253 0 460-3 459-7m290-154
103-84-47-14-47-15 6-111c8-127-5-191-56-288-82-154-302-287-433-263-32 6-33 7-23
45l10 38 82 5c102 7 [...]
}
+.custom-icons-oceanbase {
+ background-image: url("data:image/svg+xml,%3Csvg
xmlns='http://www.w3.org/2000/svg' viewBox='0 0 2800 2800' width='2800'
height='2800'%3E%3Cpath fill='%230181FD' d='M338
1933c-17-4-18-31-18-383v-378l148 5c251 9 542-36 827-127 222-71 357-103 560-135
136-22 427-38 548-30l107 7v764l-159-4c-163-4-323 7-478 33-83 14-374 94-418
115-21 10-164 47-280 74-104 23-245 44-380 56-118 10-423 12-457 3'/%3E%3Cpath
fill='%2307C846' d='M1509 2094c-27-70-66-200-63-206 7-11 251-88 348-109 215-48
552-73 679 [...]
+}
+
.custom-icons-paimon {
background-image: url("data:image/svg+xml,%3Csvg
xmlns='http://www.w3.org/2000/svg' viewBox='0 0 218.61 218.61' width='218.61'
height='218.61'%3E%3Cdefs%3E%3Cstyle%3E.cls-2{fill:%230163e1}%3C/style%3E%3C/defs%3E%3Cg
id='svgID0'%3E%3Cpath d='M55.63 111.28a35.01 35.01 0
00-21.95-21.65l-12.74-4.26h80.4c19.85-7.47 43.6-13.02 72.56-17.39l19.6-3.48
13.7-3.85C189.3 24.7 152.19 0 109.3 0 48.94 0 0 48.94 0 109.3c0 20.41 2.93
39.59 17.2 58.79 8.15-17.84 23.42-40.44 38.43-56.82Z' class='cls-2'/%3 [...]
}
diff --git a/web/web/src/lib/icons/svg/oceanbase.svg
b/web/web/src/lib/icons/svg/oceanbase.svg
new file mode 100644
index 000000000..e140dd1e9
--- /dev/null
+++ b/web/web/src/lib/icons/svg/oceanbase.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg class="img-fluid" id="outputsvg" xmlns="http://www.w3.org/2000/svg";
style="transform: matrix(1, 0, 0, 1, 0, 0); transform-origin: 50% 50%; cursor:
move; max-height: none; transition: transform 200ms ease-in-out 0s;"
width="280" height="280" viewBox="0 0 2800 2800">
+ <g id="l1FLkn6jgqwOe1OQbCdWskk" fill="rgb(1,129,253)" style="transform:
none;">
+ <g style="transform: none;">
+ <path id="pqCWjVUON" d="M338 1933 c-17 -4 -18 -31 -18 -383 l0 -378 148 5
c251 9 542 -36 827 -127 222 -71 357 -103 560 -135 136 -22 427 -38 548 -30 l107
7 0 382 0 382 -159 -4 c-163 -4 -323 7 -478 33 -83 14 -374 94 -418 115 -21 10
-164 47 -280 74 -104 23 -245 44 -380 56 -118 10 -423 12 -457 3z"></path>
+ </g>
+ </g>
+ <g id="l3Tw7sWw6PeBNAiRP2RWbkL" fill="rgb(7,200,70)" style="transform:
none;">
+ <g style="transform: none;">
+ <path id="p18iitp5Ia" d="M1509 2094 c-27 -70 -66 -200 -63 -206 7 -11 251
-88 348 -109 215 -48 552 -73 679 -53 l37 7 0 123 0 124 -132 -6 c-279 -14 -552
33 -845 143 -7 3 -18 -8 -24 -23z"></path>
+ </g>
+ </g>
+ <g id="l25zI63SdRTqq2xRblRuhKG" fill="rgb(255,160,5)" style="transform:
none;">
+ <g style="transform: none;">
+ <path id="pecUtCUzo" d="M320 970 l0 -132 33 6 c84 17 219 18 362 1 142
-16 378 -59 400 -73 5 -4 52 -21 103 -38 108 -35 97 -43 137 91 15 50 30 95 32
101 7 18 -229 94 -407 132 -156 32 -179 34 -412 39 l-248 5 0 -132z"></path>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/web/web/src/lib/utils/initial.js b/web/web/src/lib/utils/initial.js
index 3517ecd2e..8629bcd18 100644
--- a/web/web/src/lib/utils/initial.js
+++ b/web/web/src/lib/utils/initial.js
@@ -308,5 +308,33 @@ export const providers = [
description: 'Apache Hudi catalog uri config'
}
]
+ },
+ {
+ label: 'OceanBase',
+ value: 'jdbc-oceanbase',
+ defaultProps: [
+ {
+ key: 'jdbc-driver',
+ value: '',
+ required: true,
+ description: 'e.g. com.mysql.jdbc.Driver or com.mysql.cj.jdbc.Driver
or com.oceanbase.jdbc.Driver'
+ },
+ {
+ key: 'jdbc-url',
+ value: '',
+ required: true,
+ description: 'e.g. jdbc:mysql://localhost:2881 or
jdbc:oceanbase://localhost:2881'
+ },
+ {
+ key: 'jdbc-user',
+ value: '',
+ required: true
+ },
+ {
+ key: 'jdbc-password',
+ value: '',
+ required: true
+ }
+ ]
}
]
