bugfix for frontend of dashboard 0.3.3 (#700)

* fix search Parameter name error * fix status tag in TenantBasicInfo * fix topo Toleration payload * fix controlParameter in table * update disableUnescrow in Parameter table * fix accordance tag * fix ParametersDatas filter and pvcIndependent show * fix Deletion protection in tenant new and cluster new * fix Dropdown menu click * fix Deletion protection checkbox show in tenant detail * fix storageClass from in cluster new * fix CR * chore: gen api * update disable dropmenu delete button * improve：update NFSInfoModal placeholder
oceanbase · Jan 7, 2025 · 8ae97d4 · 8ae97d4
1 parent dcd7a6f
commit 8ae97d4
Show file tree

Hide file tree

Showing 14 changed files with 214 additions and 97 deletions.
diff --git a/ui/src/api/generated/api.ts b/ui/src/api/generated/api.ts
@@ -2156,12 +2156,6 @@ export interface ModelParameter {
      * @memberof ModelParameter
      */
     'dataType'?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof ModelParameter
-     */
-    'defaultValue'?: string;
     /**
      * 
      * @type {string}
@@ -2174,12 +2168,6 @@ export interface ModelParameter {
      * @memberof ModelParameter
      */
     'info'?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof ModelParameter
-     */
-    'isDefault'?: string;
     /**
      * 
      * @type {string}
@@ -5561,6 +5549,12 @@ export interface ResponseNamespace {
  * @interface ResponseOBCluster
  */
 export interface ResponseOBCluster {
+    /**
+     * 
+     * @type {Array<CommonKVPair>}
+     * @memberof ResponseOBCluster
+     */
+    'annotations'?: Array<CommonKVPair>;
     /**
      * 
      * @type {ResponseNFSVolumeSpec}
@@ -5585,6 +5579,12 @@ export interface ResponseOBCluster {
      * @memberof ResponseOBCluster
      */
     'createTime': number;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof ResponseOBCluster
+     */
+    'deletionProtection': boolean;
     /**
      * 
      * @type {string}
@@ -5627,6 +5627,12 @@ export interface ResponseOBCluster {
      * @memberof ResponseOBCluster
      */
     'parameters': Array<ResponseParameterSpec>;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof ResponseOBCluster
+     */
+    'pvcIndependent': boolean;
     /**
      * 
      * @type {ResponseResourceSpecRender}
@@ -5702,6 +5708,12 @@ export interface ResponseOBClusterMeta {
      * @memberof ResponseOBClusterMeta
      */
     'clusterName': string;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof ResponseOBClusterMeta
+     */
+    'deletionProtection': boolean;
     /**
      * 
      * @type {CommonClusterMode}
@@ -5720,6 +5732,12 @@ export interface ResponseOBClusterMeta {
      * @memberof ResponseOBClusterMeta
      */
     'namespace': string;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof ResponseOBClusterMeta
+     */
+    'pvcIndependent': boolean;
     /**
      * 
      * @type {boolean}
@@ -5759,6 +5777,12 @@ export interface ResponseOBClusterOverview {
      * @memberof ResponseOBClusterOverview
      */
     'createTime': number;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof ResponseOBClusterOverview
+     */
+    'deletionProtection': boolean;
     /**
      * 
      * @type {string}
@@ -5783,6 +5807,12 @@ export interface ResponseOBClusterOverview {
      * @memberof ResponseOBClusterOverview
      */
     'namespace': string;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof ResponseOBClusterOverview
+     */
+    'pvcIndependent': boolean;
     /**
      * 
      * @type {string}
@@ -6063,6 +6093,12 @@ export interface ResponseOBServerStorage {
  * @interface ResponseOBTenantDetail
  */
 export interface ResponseOBTenantDetail {
+    /**
+     * 
+     * @type {Array<CommonKVPair>}
+     * @memberof ResponseOBTenantDetail
+     */
+    'annotations'?: Array<CommonKVPair>;
     /**
      * Charset of the tenant
      * @type {string}
@@ -6081,6 +6117,12 @@ export interface ResponseOBTenantDetail {
      * @memberof ResponseOBTenantDetail
      */
     'createTime': string;
+    /**
+     * Whether the tenant is protected from deletion
+     * @type {boolean}
+     * @memberof ResponseOBTenantDetail
+     */
+    'deletionProtection': boolean;
     /**
      * Locality of the tenant units
      * @type {string}
@@ -6196,6 +6238,12 @@ export interface ResponseOBTenantOverview {
      * @memberof ResponseOBTenantOverview
      */
     'createTime': string;
+    /**
+     * Whether the tenant is protected from deletion
+     * @type {boolean}
+     * @memberof ResponseOBTenantOverview
+     */
+    'deletionProtection': boolean;
     /**
      * Locality of the tenant units
      * @type {string}

diff --git a/ui/src/constants/index.ts b/ui/src/constants/index.ts
@@ -83,6 +83,7 @@ const CLUSTER_INFO_CONFIG = [
   'parameters',
   'deletionProtection',
   'topology',
+  'pvcIndependent',
 ];
 
 const TOPO_INFO_CONFIG = [

diff --git a/ui/src/i18n/strings/en-US.json b/ui/src/i18n/strings/en-US.json
@@ -1231,10 +1231,10 @@
   "src.pages.Cluster.Detail.Overview.426E8CD7": "Note that removing a mounted NFS backup volume will roll and restart all nodes. Do you want to confirm the removal?",
   "src.pages.Cluster.Detail.Overview.DB5B21F0": "Address",
   "src.pages.Cluster.Detail.Overview.60033114": "Please enter an address",
-  "src.pages.Cluster.Detail.Overview.D16F4B6E": "Please enter",
+  "src.pages.Cluster.Detail.Overview.D16F4B6E": "For example, 172.17.x.x",
   "src.pages.Cluster.Detail.Overview.ACC053A9": "Path",
   "src.pages.Cluster.Detail.Overview.B7E9F065": "Please enter a path",
-  "src.pages.Cluster.Detail.Overview.D0356ACB": "Please enter",
+  "src.pages.Cluster.Detail.Overview.D0356ACB": "For example, /opt/nfs",
   "src.pages.Cluster.Detail.Overview.0798E33D": "Note that mounting the backup volume will roll-restart all nodes",
   "src.pages.Cluster.Detail.Overview.02AE8EA0": "Deletion protection modified successfully",
   "src.pages.Cluster.Detail.Overview.8DB38279": "Deletion protection",

diff --git a/ui/src/i18n/strings/zh-CN.json b/ui/src/i18n/strings/zh-CN.json
@@ -1253,10 +1253,10 @@
   "src.pages.Cluster.Detail.Overview.426E8CD7": " 注意，移除挂载的 NFS 备份卷会滚动重启所有节点，确认移除吗？",
   "src.pages.Cluster.Detail.Overview.DB5B21F0": "地址",
   "src.pages.Cluster.Detail.Overview.60033114": "请输入地址",
-  "src.pages.Cluster.Detail.Overview.D16F4B6E": "请输入",
+  "src.pages.Cluster.Detail.Overview.D16F4B6E": "例如 172.17.x.x",
   "src.pages.Cluster.Detail.Overview.ACC053A9": "路径",
   "src.pages.Cluster.Detail.Overview.B7E9F065": "请输入路径",
-  "src.pages.Cluster.Detail.Overview.D0356ACB": "请输入",
+  "src.pages.Cluster.Detail.Overview.D0356ACB": "例如 /opt/nfs",
   "src.pages.Cluster.Detail.Overview.0798E33D": "注意，挂载备份卷会滚动重启所有节点",
   "src.pages.Cluster.Detail.Overview.02AE8EA0": "修改删除保护已成功",
   "src.pages.Cluster.Detail.Overview.8DB38279": "删除保护",

diff --git a/ui/src/pages/Cluster/Detail/Overview/BasicInfo.tsx b/ui/src/pages/Cluster/Detail/Overview/BasicInfo.tsx
@@ -112,11 +112,11 @@ export default function BasicInfo({
   clusterName,
   style,
   deletionProtection,
+  clusterDetailRefresh,
   ...props
 }: ResponseOBCluster & { style?: React.CSSProperties; extra?: boolean }) {
   const statusItem = findByValue(STATUS_LIST, status);
   const statusDetailItem = findByValue(STATUS_LIST, statusDetail);
-
   const topologyRendering: ITopologyRendering = useMemo(() => {
     const rendering: ITopologyRendering = {
       show: false,
@@ -171,6 +171,7 @@ export default function BasicInfo({
               defaultMessage: '修改删除保护已成功',
             }),
           );
+          clusterDetailRefresh();
         }
       },
     },

diff --git a/ui/src/pages/Cluster/Detail/Overview/NFSInfoModal.tsx b/ui/src/pages/Cluster/Detail/Overview/NFSInfoModal.tsx
@@ -105,7 +105,7 @@ const NFSInfoModal: React.FC<NFSInfoModalProps> = ({
             <Input
               placeholder={intl.formatMessage({
                 id: 'src.pages.Cluster.Detail.Overview.D16F4B6E',
-                defaultMessage: '请输入',
+                defaultMessage: '例如 172.17.x.x',
               })}
             />
           </Form.Item>
@@ -128,7 +128,7 @@ const NFSInfoModal: React.FC<NFSInfoModalProps> = ({
             <Input
               placeholder={intl.formatMessage({
                 id: 'src.pages.Cluster.Detail.Overview.D0356ACB',
-                defaultMessage: '请输入',
+                defaultMessage: '例如 /opt/nfs',
               })}
             />
           </Form.Item>