OS-7009: Pools page issues

https://datatrendstech.atlassian.net/browse/OS-7009
hystax · Nov 14, 2023 · d86be6f · d86be6f
1 parent 2754e9d
commit d86be6f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 14 deletions.
diff --git a/ngui/ui/src/components/PoolsTable/columns/expenses.tsx b/ngui/ui/src/components/PoolsTable/columns/expenses.tsx
@@ -27,8 +27,13 @@ const expenses = () => ({
     }
 
     if (cost > limit) {
-      const timesMoreValue = round(percentXofY(cost, limit), 1);
-      const timesMore = timesMoreValue !== 1 ? ` (x${timesMoreValue})` : "";
+      const getTimesMore = () => {
+        const timesMoreValue = round(percentXofY(cost, limit), 1);
+        return timesMoreValue !== 1 ? ` (x${timesMoreValue})` : "";
+      };
+      // self assigned pool can have 0 limit
+      const timesMore = limit !== 0 ? getTimesMore() : "";
+
       return (
         <Tooltip
           title={

diff --git a/ngui/ui/src/components/PoolsTable/utils.ts b/ngui/ui/src/components/PoolsTable/utils.ts
@@ -24,6 +24,7 @@ const getSelfAssignedItem = (item, allPools, selfAssignedName) => {
 
   return {
     ...itemInfo,
+    remain: unallocatedLimit - selfCost,
     parent_id: item.id,
     name: selfAssignedName,
     purpose: undefined,
@@ -40,20 +41,21 @@ export const patchPools = (rootPool, selfAssignedNameFn) => {
 
   const selfAssignedChildren = [];
 
-  const childrenUpdated = rootPool.children?.map((pool) => {
-    const patchedPool = {
-      ...pool,
-      hasChildren: rootPool.children.some(({ parent_id: parentId }) => parentId === pool.id),
-      hasLimit: getHasLimit(pool),
-      remain: getRemain(pool)
-    };
+  const childrenUpdated =
+    rootPool.children?.map((pool) => {
+      const patchedPool = {
+        ...pool,
+        hasChildren: rootPool.children.some(({ parent_id: parentId }) => parentId === pool.id),
+        hasLimit: getHasLimit(pool),
+        remain: getRemain(pool)
+      };
 
-    if (patchedPool.hasChildren) {
-      selfAssignedChildren.push(getSelfAssignedItem(patchedPool, rootPool.children, selfAssignedNameFn(patchedPool.name)));
-    }
+      if (patchedPool.hasChildren) {
+        selfAssignedChildren.push(getSelfAssignedItem(patchedPool, rootPool.children, selfAssignedNameFn(patchedPool.name)));
+      }
 
-    return patchedPool;
-  });
+      return patchedPool;
+    }) ?? [];
 
   const rootPoolPatched = {
     ...rootPool,