@dovetail-v2/refine 0.3.28-alpha.3 → 0.3.29-alpha.0

package/dist/i18n.d.ts

@@ -201,9 +201,9 @@ export declare const resources: {
             default_sc: string;
             reclaim_policy: string;
             allow_expand: string;
-            edit_distribute_storage: string;
-            edit_distribute_storage_success_toast: string;
-            edit_distribute_storage_failed_toast: string;
+            request_capacity: string;
+            edit_request_capacity: string;
+            edit_request_capacity_success_toast: string;
             edit_taint: string;
             edit_node_taint: string;
             edit_node_taint_success_toast: string;
@@ -478,9 +478,9 @@ export declare const resources: {
             default_sc: string;
             reclaim_policy: string;
             allow_expand: string;
-            edit_distribute_storage: string;
-            edit_distribute_storage_success_toast: string;
-            edit_distribute_storage_failed_toast: string;
+            request_capacity: string;
+            edit_request_capacity: string;
+            edit_request_capacity_success_toast: string;
             edit_taint: string;
             edit_node_taint: string;
             edit_node_taint_success_toast: string;

package/dist/locales/en-US/index.d.ts

@@ -198,9 +198,9 @@ declare const _default: {
         default_sc: string;
         reclaim_policy: string;
         allow_expand: string;
-        edit_distribute_storage: string;
-        edit_distribute_storage_success_toast: string;
-        edit_distribute_storage_failed_toast: string;
+        request_capacity: string;
+        edit_request_capacity: string;
+        edit_request_capacity_success_toast: string;
         edit_taint: string;
         edit_node_taint: string;
         edit_node_taint_success_toast: string;

package/dist/locales/zh-CN/index.d.ts

@@ -196,9 +196,9 @@ declare const _default: {
         default_sc: string;
         reclaim_policy: string;
         allow_expand: string;
-        edit_distribute_storage: string;
-        edit_distribute_storage_success_toast: string;
-        edit_distribute_storage_failed_toast: string;
+        request_capacity: string;
+        edit_request_capacity: string;
+        edit_request_capacity_success_toast: string;
         edit_taint: string;
         edit_node_taint: string;
         edit_node_taint_success_toast: string;

package/dist/models/persistent-volume-claim.d.ts

@@ -11,6 +11,7 @@ export declare class PersistentVolumeClaimModel extends ResourceModel {
     get pv(): string | undefined;
     get stateDisplay(): ResourceState.FAILED | ResourceState.PENDING | ResourceState.BOUND | ResourceState.LOST | undefined;
     get storageBytes(): number;
+    get allocatedStorageBytes(): number;
     updateDistributeStorage(distributeStorage: number): Unstructured;
 }
 export {};

package/dist/refine.cjs

@@ -655,9 +655,9 @@ const retain$1 = "Retain";
 const default_sc$1 = "Default storage class";
 const reclaim_policy$1 = "Reclaim policy";
 const allow_expand$1 = "Volume expansion";
-const edit_distribute_storage$1 = "Edit capacity allocation";
-const edit_distribute_storage_success_toast$1 = "Successfully edited the capacity allocation";
-const edit_distribute_storage_failed_toast$1 = "Failed to edit the capacity allocation";
+const request_capacity$1 = "Request capacity";
+const edit_request_capacity$1 = "Edit request capacity";
+const edit_request_capacity_success_toast$1 = "Successfully edited request capacity";
 const edit_taint$1 = "Edit taint";
 const edit_node_taint$1 = "Edit taint";
 const edit_node_taint_success_toast$1 = "Successfully edited the taint for the node {{name}}";
@@ -666,10 +666,10 @@ const node_taint_PreferNoSchedule$1 = "PreferNoSchedule";
 const node_taint_NoExecute$1 = "NoExecute";
 const taint$1 = "Taint";
 const change_form_mode_alert$1 = "Switching from YAML editing to form editing will discard all changes made to the YAML file.";
-const pvc_storage_required$1 = "Please specify the allocation.";
+const pvc_storage_required$1 = "Please specify the request capacity.";
 const pvc_storage_min$1 = "Please enter a positive integer.";
 const pvc_storage_reduce_limit$1 = "The value cannot be less than the current value.";
-const pvc_storage_max_limit$1 = "The allocation cannot exceed 64 TiB.";
+const pvc_storage_max_limit$1 = "The request capacity cannot exceed 64 TiB.";
 const key_empty_text$1 = "Please specify a key.";
 const format_error$1 = "Format error.";
 const taint_effect_empty_text$1 = "Please select an effect.";
@@ -931,9 +931,9 @@ const dovetail$1 = {
   default_sc: default_sc$1,
   reclaim_policy: reclaim_policy$1,
   allow_expand: allow_expand$1,
-  edit_distribute_storage: edit_distribute_storage$1,
-  edit_distribute_storage_success_toast: edit_distribute_storage_success_toast$1,
-  edit_distribute_storage_failed_toast: edit_distribute_storage_failed_toast$1,
+  request_capacity: request_capacity$1,
+  edit_request_capacity: edit_request_capacity$1,
+  edit_request_capacity_success_toast: edit_request_capacity_success_toast$1,
   edit_taint: edit_taint$1,
   edit_node_taint: edit_node_taint$1,
   edit_node_taint_success_toast: edit_node_taint_success_toast$1,
@@ -1205,9 +1205,9 @@ const retain = "保留";
 const default_sc = "默认存储类";
 const reclaim_policy = "回收策略";
 const allow_expand = "卷扩容";
-const edit_distribute_storage = "编辑分配量";
-const edit_distribute_storage_success_toast = "编辑分配量成功";
-const edit_distribute_storage_failed_toast = "编辑分配量失败";
+const request_capacity = "申请量";
+const edit_request_capacity = "编辑申请量";
+const edit_request_capacity_success_toast = "编辑申请量成功";
 const edit_taint = "编辑污点";
 const edit_node_taint = "编辑污点";
 const edit_node_taint_success_toast = "编辑节点 {{name}} 的污点成功";
@@ -1216,10 +1216,10 @@ const node_taint_PreferNoSchedule = "尽可能阻止调度";
 const node_taint_NoExecute = "阻止调度并驱逐 Pod";
 const taint = "污点";
 const change_form_mode_alert = "从编辑 YAML 切回表单编辑，将无法保留对 YAML 文件做出的所有更改。";
-const pvc_storage_required = "请填写分配量。";
+const pvc_storage_required = "请填写申请量。";
 const pvc_storage_min = "请输入正整数。";
 const pvc_storage_reduce_limit = "输入值不得小于当前数值。";
-const pvc_storage_max_limit = "分配量不能超过 64 TiB。";
+const pvc_storage_max_limit = "申请量不能超过 64 TiB。";
 const key_empty_text = "请填写键。";
 const format_error = "格式错误。";
 const taint_effect_empty_text = "请选择效果。";
@@ -1480,9 +1480,9 @@ const dovetail = {
   default_sc,
   reclaim_policy,
   allow_expand,
-  edit_distribute_storage,
-  edit_distribute_storage_success_toast,
-  edit_distribute_storage_failed_toast,
+  request_capacity,
+  edit_request_capacity,
+  edit_request_capacity_success_toast,
   edit_taint,
   edit_node_taint,
   edit_node_taint_success_toast,
@@ -7646,7 +7646,6 @@ function ValueDisplay(props) {
   } = props;
   const htmlTitle = typeof value2 === "string" || typeof value2 === "number" ? String(value2) : void 0;
   const result = useOverflow ? /* @__PURE__ */ common.jsxRuntimeExports.jsx("div", {
-    title: htmlTitle,
     style,
     className: common.cx_default(className, ContentStyle$2),
     children: /* @__PURE__ */ common.jsxRuntimeExports.jsx(eagle.OverflowTooltip, {
@@ -8666,7 +8665,7 @@ const DistributeStorageForm = React.forwardRef(function DistributeStorageForm2(p
       values: v,
       successNotification() {
         return {
-          message: t2("dovetail.edit_distribute_storage_success_toast", {
+          message: t2("dovetail.edit_request_capacity_success_toast", {
             kind: pvc2.kind,
             name: pvc2.id,
             interpolation: {
@@ -8689,7 +8688,7 @@ const DistributeStorageForm = React.forwardRef(function DistributeStorageForm2(p
   return /* @__PURE__ */ common.jsxRuntimeExports.jsx(
     eagle.Form.Item,
     {
-      label: /* @__PURE__ */ common.jsxRuntimeExports.jsx("span", { style: { width: "134px" }, children: label2 || t2("dovetail.distributed") }),
+      label: /* @__PURE__ */ common.jsxRuntimeExports.jsx("span", { style: { width: "134px" }, children: label2 || t2("dovetail.request_capacity") }),
       colon: false,
       help: validateResult.distributeStorage,
       validateStatus: validateResult.distributeStorage ? "error" : "",
@@ -8742,7 +8741,7 @@ function PVCDistributeStorage({
       {
         modalProps: {
           formRef,
-          title: t2("dovetail.edit_distribute_storage"),
+          title: t2("dovetail.edit_request_capacity"),
           namespace: pvc2.namespace || "",
           renderContent() {
             return /* @__PURE__ */ common.jsxRuntimeExports.jsx(
@@ -10230,6 +10229,9 @@ class PersistentVolumeClaimModel extends ResourceModel {
   get storageBytes() {
     return parseSi(lodashEs.get(this._rawYaml, "spec.resources.requests.storage") || "0Gi");
   }
+  get allocatedStorageBytes() {
+    return parseSi(lodashEs.get(this._rawYaml, "status.capacity.storage") || "0Gi");
+  }
   updateDistributeStorage(distributeStorage) {
     const yaml2 = lodashEs.cloneDeep(this._globalStore.restoreItem(this));
     return lodashEs.set(yaml2, "spec.resources.requests.storage", `${distributeStorage}Gi`);
@@ -14182,7 +14184,7 @@ const PVCStorageField = ({
     key: "storage",
     col: 12,
     path: ["spec", "resources", "requests", "storage"],
-    title: i18n2.t("dovetail.distributed"),
+    title: i18n2.t("dovetail.request_capacity"),
     renderContent(value2, pvc2) {
       return /* @__PURE__ */ common.jsxRuntimeExports.jsx(PVCDistributeStorage, {
         pvc: pvc2,
@@ -19961,7 +19963,7 @@ const PVCStorageColumnRenderer = (i18n2) => {
   return {
     key: "storage",
     display: true,
-    dataIndex: ["storageBytes"],
+    dataIndex: ["allocatedStorageBytes"],
     title: i18n2.t("dovetail.distributed"),
     width: 120,
     sortable: true,

package/dist/refine.js

@@ -636,9 +636,9 @@ const retain$1 = "Retain";
 const default_sc$1 = "Default storage class";
 const reclaim_policy$1 = "Reclaim policy";
 const allow_expand$1 = "Volume expansion";
-const edit_distribute_storage$1 = "Edit capacity allocation";
-const edit_distribute_storage_success_toast$1 = "Successfully edited the capacity allocation";
-const edit_distribute_storage_failed_toast$1 = "Failed to edit the capacity allocation";
+const request_capacity$1 = "Request capacity";
+const edit_request_capacity$1 = "Edit request capacity";
+const edit_request_capacity_success_toast$1 = "Successfully edited request capacity";
 const edit_taint$1 = "Edit taint";
 const edit_node_taint$1 = "Edit taint";
 const edit_node_taint_success_toast$1 = "Successfully edited the taint for the node {{name}}";
@@ -647,10 +647,10 @@ const node_taint_PreferNoSchedule$1 = "PreferNoSchedule";
 const node_taint_NoExecute$1 = "NoExecute";
 const taint$1 = "Taint";
 const change_form_mode_alert$1 = "Switching from YAML editing to form editing will discard all changes made to the YAML file.";
-const pvc_storage_required$1 = "Please specify the allocation.";
+const pvc_storage_required$1 = "Please specify the request capacity.";
 const pvc_storage_min$1 = "Please enter a positive integer.";
 const pvc_storage_reduce_limit$1 = "The value cannot be less than the current value.";
-const pvc_storage_max_limit$1 = "The allocation cannot exceed 64 TiB.";
+const pvc_storage_max_limit$1 = "The request capacity cannot exceed 64 TiB.";
 const key_empty_text$1 = "Please specify a key.";
 const format_error$1 = "Format error.";
 const taint_effect_empty_text$1 = "Please select an effect.";
@@ -912,9 +912,9 @@ const dovetail$1 = {
   default_sc: default_sc$1,
   reclaim_policy: reclaim_policy$1,
   allow_expand: allow_expand$1,
-  edit_distribute_storage: edit_distribute_storage$1,
-  edit_distribute_storage_success_toast: edit_distribute_storage_success_toast$1,
-  edit_distribute_storage_failed_toast: edit_distribute_storage_failed_toast$1,
+  request_capacity: request_capacity$1,
+  edit_request_capacity: edit_request_capacity$1,
+  edit_request_capacity_success_toast: edit_request_capacity_success_toast$1,
   edit_taint: edit_taint$1,
   edit_node_taint: edit_node_taint$1,
   edit_node_taint_success_toast: edit_node_taint_success_toast$1,
@@ -1186,9 +1186,9 @@ const retain = "保留";
 const default_sc = "默认存储类";
 const reclaim_policy = "回收策略";
 const allow_expand = "卷扩容";
-const edit_distribute_storage = "编辑分配量";
-const edit_distribute_storage_success_toast = "编辑分配量成功";
-const edit_distribute_storage_failed_toast = "编辑分配量失败";
+const request_capacity = "申请量";
+const edit_request_capacity = "编辑申请量";
+const edit_request_capacity_success_toast = "编辑申请量成功";
 const edit_taint = "编辑污点";
 const edit_node_taint = "编辑污点";
 const edit_node_taint_success_toast = "编辑节点 {{name}} 的污点成功";
@@ -1197,10 +1197,10 @@ const node_taint_PreferNoSchedule = "尽可能阻止调度";
 const node_taint_NoExecute = "阻止调度并驱逐 Pod";
 const taint = "污点";
 const change_form_mode_alert = "从编辑 YAML 切回表单编辑，将无法保留对 YAML 文件做出的所有更改。";
-const pvc_storage_required = "请填写分配量。";
+const pvc_storage_required = "请填写申请量。";
 const pvc_storage_min = "请输入正整数。";
 const pvc_storage_reduce_limit = "输入值不得小于当前数值。";
-const pvc_storage_max_limit = "分配量不能超过 64 TiB。";
+const pvc_storage_max_limit = "申请量不能超过 64 TiB。";
 const key_empty_text = "请填写键。";
 const format_error = "格式错误。";
 const taint_effect_empty_text = "请选择效果。";
@@ -1461,9 +1461,9 @@ const dovetail = {
   default_sc,
   reclaim_policy,
   allow_expand,
-  edit_distribute_storage,
-  edit_distribute_storage_success_toast,
-  edit_distribute_storage_failed_toast,
+  request_capacity,
+  edit_request_capacity,
+  edit_request_capacity_success_toast,
   edit_taint,
   edit_node_taint,
   edit_node_taint_success_toast,
@@ -7627,7 +7627,6 @@ function ValueDisplay(props) {
   } = props;
   const htmlTitle = typeof value2 === "string" || typeof value2 === "number" ? String(value2) : void 0;
   const result = useOverflow ? /* @__PURE__ */ jsxRuntimeExports.jsx("div", {
-    title: htmlTitle,
     style,
     className: cx_default(className, ContentStyle$2),
     children: /* @__PURE__ */ jsxRuntimeExports.jsx(OverflowTooltip, {
@@ -8647,7 +8646,7 @@ const DistributeStorageForm = React.forwardRef(function DistributeStorageForm2(p
       values: v,
       successNotification() {
         return {
-          message: t2("dovetail.edit_distribute_storage_success_toast", {
+          message: t2("dovetail.edit_request_capacity_success_toast", {
             kind: pvc2.kind,
             name: pvc2.id,
             interpolation: {
@@ -8670,7 +8669,7 @@ const DistributeStorageForm = React.forwardRef(function DistributeStorageForm2(p
   return /* @__PURE__ */ jsxRuntimeExports.jsx(
     Form.Item,
     {
-      label: /* @__PURE__ */ jsxRuntimeExports.jsx("span", { style: { width: "134px" }, children: label2 || t2("dovetail.distributed") }),
+      label: /* @__PURE__ */ jsxRuntimeExports.jsx("span", { style: { width: "134px" }, children: label2 || t2("dovetail.request_capacity") }),
       colon: false,
       help: validateResult.distributeStorage,
       validateStatus: validateResult.distributeStorage ? "error" : "",
@@ -8723,7 +8722,7 @@ function PVCDistributeStorage({
       {
         modalProps: {
           formRef,
-          title: t2("dovetail.edit_distribute_storage"),
+          title: t2("dovetail.edit_request_capacity"),
           namespace: pvc2.namespace || "",
           renderContent() {
             return /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -10211,6 +10210,9 @@ class PersistentVolumeClaimModel extends ResourceModel {
   get storageBytes() {
     return parseSi(get$2(this._rawYaml, "spec.resources.requests.storage") || "0Gi");
   }
+  get allocatedStorageBytes() {
+    return parseSi(get$2(this._rawYaml, "status.capacity.storage") || "0Gi");
+  }
   updateDistributeStorage(distributeStorage) {
     const yaml2 = cloneDeep(this._globalStore.restoreItem(this));
     return set(yaml2, "spec.resources.requests.storage", `${distributeStorage}Gi`);
@@ -14163,7 +14165,7 @@ const PVCStorageField = ({
     key: "storage",
     col: 12,
     path: ["spec", "resources", "requests", "storage"],
-    title: i18n2.t("dovetail.distributed"),
+    title: i18n2.t("dovetail.request_capacity"),
     renderContent(value2, pvc2) {
       return /* @__PURE__ */ jsxRuntimeExports.jsx(PVCDistributeStorage, {
         pvc: pvc2,
@@ -19942,7 +19944,7 @@ const PVCStorageColumnRenderer = (i18n2) => {
   return {
     key: "storage",
     display: true,
-    dataIndex: ["storageBytes"],
+    dataIndex: ["allocatedStorageBytes"],
     title: i18n2.t("dovetail.distributed"),
     width: 120,
     sortable: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dovetail-v2/refine",
-  "version": "0.3.28-alpha.3",
+  "version": "0.3.29-alpha.0",
   "type": "module",
   "files": [
     "dist",