fix(dcellar-web-ui): fix remaining quota error

node-real · Dec 26, 2024 · 579b3cd · 579b3cd
1 parent 2d53b8e
commit 579b3cd
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/apps/dcellar-web-ui/src/facade/bucket.ts b/apps/dcellar-web-ui/src/facade/bucket.ts
@@ -236,6 +236,8 @@ export const getObjectPolicies = async (
 // todo using temp data
 export const getFolderPolicies = async (bucketId: string) => {
   const { data } = await axios.get<{ result: any[] }>(`/api/policies/${bucketId}`);
+  if (!data.result) return [];
+
   return data.result
     .filter((i) => !i.Removed)
     .map((d) => {

diff --git a/apps/dcellar-web-ui/src/middleware.ts b/apps/dcellar-web-ui/src/middleware.ts
@@ -9,7 +9,7 @@ export function middleware(request: NextRequest) {
     img-src 'self' blob: data: https: https://www.google-analytics.com https://www.googletagmanager.com;
     font-src 'self' https://fonts.gstatic.com;
     connect-src *;
-    object-src 'none';
+    object-src 'self' data;
     base-uri 'self';
     form-action 'self';
     frame-ancestors 'none';

diff --git a/apps/dcellar-web-ui/src/modules/object/components/DownloadObjectOperation.tsx b/apps/dcellar-web-ui/src/modules/object/components/DownloadObjectOperation.tsx
@@ -12,6 +12,7 @@ import { Checkbox, Flex, ModalBody, ModalFooter, ModalHeader, Text } from '@node
 import { memo, useEffect, useState } from 'react';
 import { OBJECT_ERROR_TYPES, ObjectErrorType } from '../ObjectError';
 import { setSignatureAction } from '@/store/slices/global';
+import { getRemainingQuota } from '@/modules/object/utils/getRemainingQuota';
 
 const renderProp = (key: string, value: string) => {
   return (
@@ -68,8 +69,9 @@ export const DownloadObjectOperation = memo<DownloadObjectOperationProps>(functi
     dispatch(setSignatureAction(errorData));
   };
 
-  const remainingQuota = +quotaData?.readQuota + +quotaData?.freeQuota - +quotaData?.consumedQuota;
-  const transformedRemainingQuota = remainingQuota ? formatBytes(remainingQuota, true) : '--';
+  const remainingQuota = getRemainingQuota(quotaData);
+
+  const transformedRemainingQuota = remainingQuota ? formatBytes(remainingQuota) : '--';
 
   const onAction = async () => {
     setLoading(true);

diff --git a/apps/dcellar-web-ui/src/modules/object/utils/getRemainingQuota.ts b/apps/dcellar-web-ui/src/modules/object/utils/getRemainingQuota.ts
@@ -0,0 +1,11 @@
+import { IQuotaProps } from '@bnb-chain/greenfield-js-sdk';
+
+export const getRemainingQuota = (quotaData: IQuotaProps) => {
+  if (!quotaData) return 0;
+  const { readQuota, freeQuota, consumedQuota, monthlyFreeQuota, monthlyQuotaConsumedSize } =
+    quotaData;
+  const remainingQuota =
+    freeQuota + readQuota + monthlyFreeQuota - consumedQuota - monthlyQuotaConsumedSize;
+
+  return remainingQuota;
+};
diff --git a/apps/dcellar-web-ui/src/utils/string.ts b/apps/dcellar-web-ui/src/utils/string.ts
@@ -185,6 +185,7 @@ export const formatQuota = (quota: IQuotaProps, removeSpace = true) => {
     oneTimeFreeConsumedSize: freeConsumedSize,
     oneTimeFreeRemain: freeQuota,
   };
+  console.log('value', value.remain);
 
   const f = (v: number, _removeSpace = removeSpace) => {
     if (!quota) return '--';