Merge pull request #245 from node-real/fix/bucket-meta-field-type

fix: primary id type compare
node-real · Nov 3, 2023 · 8bb8d86 · 8bb8d86
2 parents ca644ac + 4904c02
commit 8bb8d86
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/apps/dcellar-web-ui/src/store/slices/bucket.ts b/apps/dcellar-web-ui/src/store/slices/bucket.ts
@@ -81,7 +81,7 @@ export const bucketSlice = createSlice({
       const info = state.bucketInfo[bucketName];
       const newInfo = {
         ...info,
-        ...bucket
+        ...bucket,
       };
       state.bucketInfo[bucketName] = newInfo;
       state.owner = address === newInfo.Owner;
@@ -118,11 +118,11 @@ export const selectHasDiscontinue = (address: string) => (root: AppState) =>
 
 export const setupBucket =
   (bucketName: string, address?: string) => async (dispatch: AppDispatch, getState: GetState) => {
-    const [res, error] = await getUserBucketMeta(bucketName, '')
+    const [res, error] = await getUserBucketMeta(bucketName, '');
     if (error || isEmpty(res?.body)) return 'Bucket no exist';
     const bucket = {
       ...res?.body?.GfSpGetBucketMetaResponse.Bucket,
-      ...res?.body?.GfSpGetBucketMetaResponse.Bucket.BucketInfo
+      ...res?.body?.GfSpGetBucketMetaResponse.Bucket.BucketInfo,
     } as AllBucketInfo;
     const { loginAccount } = getState().persist;
     dispatch(setBucketInfo({ address: address || loginAccount, bucket: bucket }));
@@ -161,7 +161,7 @@ export const setupBuckets =
 
     const bucketSpInfo = bucketList.map((b) => ({
       bucketName: b.BucketInfo.BucketName,
-      sp: find<SpItem>(allSps, (sp) => sp.id === b.Vgf.PrimarySpId)!,
+      sp: find<SpItem>(allSps, (sp) => String(sp.id) === String(b.Vgf.PrimarySpId))!,
     }));
 
     dispatch(setPrimarySpInfos(bucketSpInfo));

diff --git a/apps/dcellar-web-ui/src/store/slices/sp.ts b/apps/dcellar-web-ui/src/store/slices/sp.ts
@@ -114,7 +114,7 @@ export const spSlice = createSlice({
 
 export const selectBucketSp = (bucket: AllBucketInfo) => (state: RootState) => {
   const { allSps } = state.sp;
-  return find<SpItem>(allSps, (sp) => sp.id === bucket.Vgf.PrimarySpId);
+  return find<SpItem>(allSps, (sp) => String(sp.id) === String(bucket.Vgf.PrimarySpId));
 };
 
 export const { setStorageProviders, setPrimarySpInfo, setPrimarySpInfos, updateSps, setSpMeta } =
@@ -147,7 +147,7 @@ export const getPrimarySpInfo =
     const [data, error] = await getVirtualGroupFamily({ familyId });
     if (error) return null;
     const sp = allSps.find(
-      (item) => item.id === data?.globalVirtualGroupFamily?.primarySpId,
+      (item) => String(item.id) === String(data?.globalVirtualGroupFamily?.primarySpId),
     ) as SpItem;
     if (!sp) return null;
     dispatch(setPrimarySpInfo({ bucketName, sp }));