refactor(rc-table and ci-list): 🎉 update rc-table and ci-list

robolaunch · Aug 29, 2023 · 95c28a0 · 95c28a0
1 parent eabaa56
commit 95c28a0
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
       <img src="https://img.shields.io/badge/nodejs-18.15.0-dgreen" alt="node">
     </a>
     <a href="https://github.com/robolaunch/ui/releases">
-      <img src="https://img.shields.io/badge/release-v0.14.4-red" alt="release">
+      <img src="https://img.shields.io/badge/release-v0.14.5-red" alt="release">
     </a>
         <a href="#">
       <img src="https://img.shields.io/badge/language-typescript-blue" alt="language">

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ui",
-  "version": "0.14.4",
+  "version": "0.14.5",
   "private": true,
   "dependencies": {
     "@emotion/css": "^11.10.6",

diff --git a/src/components/SidebarLists/CloudInstancesList.tsx b/src/components/SidebarLists/CloudInstancesList.tsx
@@ -7,6 +7,10 @@ import SidebarListItem from "./SidebarListItem";
 import useMain from "../../hooks/useMain";
 import SidebarListLoader from "../SidebarListLoader/SidebarListLoader";
 import CloudInstancesListItemDesc from "../CloudInstancesListItemDesc/CloudInstancesListItemDesc";
+import {
+  envOnPremiseFleet,
+  envOnPremiseRobot,
+} from "../../helpers/envProvider";
 
 interface ICloudInstancesList {
   reload: boolean;
@@ -62,7 +66,7 @@ export default function CloudInstancesList({
 
   return (
     <Fragment>
-      <SidebarInstancesTabs />
+      {!(envOnPremiseFleet || envOnPremiseRobot) && <SidebarInstancesTabs />}
       {!selectedState?.organization || !selectedState?.roboticsCloud ? (
         <SidebarInfo
           text={`Select an ${

diff --git a/src/components/TableActionCells/InstanceActionCells.tsx b/src/components/TableActionCells/InstanceActionCells.tsx
@@ -22,8 +22,6 @@ export default function InstanceActionCells({
   const [isTerminateModalVisible, setIsTerminateModalVisible] =
     useState<boolean>(false);
 
-  console.log(data);
-
   return (
     <Fragment>
       <div className="card flex gap-4 float-right">

diff --git a/src/contexts/FunctionsContext.tsx b/src/contexts/FunctionsContext.tsx
@@ -28,29 +28,30 @@ import {
   getBuildManagers as getBuildManagerDispatch,
   getLaunchManagers as getLaunchManagerDispatch,
 } from "../toolkit/RobotSlice";
-import { getRoboticsClouds as getRoboticsCloudDispatch } from "../toolkit/RoboticsCloudSlice";
-import { getOrganizations as getAllOrganizations } from "../toolkit/OrganizationSlice";
-import { getPhysicalInstances as getAllPhysicalInstances } from "../toolkit/InstanceSlice";
-import { getInstances as getAllInstances } from "../toolkit/InstanceSlice";
 import {
   getFederatedFleets,
   createFederatedFleet,
   getNamespaces as getNamespacesDispatch,
 } from "../toolkit/FleetSlice";
-import { getIP as getCurrentIP } from "../toolkit/TrialSlice";
+import {
+  IgetEnvironmentRequest,
+  IsingleGetEnviromentParameters,
+} from "../interfaces/environmentInterfaces";
 import {
   getEnvironments as getEnvironmentsDispatch,
   getEnvironment as getEnvironmentDispatch,
 } from "../toolkit/EnvironmentSlice";
+import { getRoboticsClouds as getRoboticsCloudDispatch } from "../toolkit/RoboticsCloudSlice";
+import { getPhysicalInstances as getAllPhysicalInstances } from "../toolkit/InstanceSlice";
+import { getOrganizations as getAllOrganizations } from "../toolkit/OrganizationSlice";
+import { getInstances as getAllInstances } from "../toolkit/InstanceSlice";
+import { getIP as getCurrentIP } from "../toolkit/TrialSlice";
 import useCreateRobot from "../hooks/useCreateRobot";
 import { useAppDispatch } from "../hooks/redux";
 import { useNavigate } from "react-router-dom";
 import useMain from "../hooks/useMain";
 import { toast } from "sonner";
-import {
-  IgetEnvironmentRequest,
-  IsingleGetEnviromentParameters,
-} from "../interfaces/environmentInterfaces";
+
 import { ISelectedState } from "../interfaces/mainInterfaces";
 
 export const FunctionsContext: any = createContext<any>(null);

diff --git a/src/pages/DashboardsPage/RoboticsCloudDashboardPage/RoboticsCloudDashboardPage.tsx b/src/pages/DashboardsPage/RoboticsCloudDashboardPage/RoboticsCloudDashboardPage.tsx
@@ -5,20 +5,21 @@ import React, {
   useMemo,
   useState,
 } from "react";
-import InformationWidget from "../../../components/InformationWidget/InformationWidget";
+import CirclePercentageBar from "../../../components/CirclePercentageBar/CirclePercentageBar";
 import InstanceActionCells from "../../../components/TableActionCells/InstanceActionCells";
-import GeneralTable from "../../../components/Table/GeneralTable";
+import InformationWidget from "../../../components/InformationWidget/InformationWidget";
+import RegionsWidget from "../../../components/RegionsWidget/RegionsWidget";
 import BasicCell from "../../../components/TableInformationCells/BasicCell";
 import StateCell from "../../../components/TableInformationCells/StateCell";
 import InfoCell from "../../../components/TableInformationCells/InfoCell";
-import { useParams } from "react-router-dom";
+import CountWidget from "../../../components/CountWidget/CountWidget";
+import GeneralTable from "../../../components/Table/GeneralTable";
+import DashboardLayout from "../../../layouts/DashboardLayout";
 import Button from "../../../components/Button/Button";
-import useMain from "../../../hooks/useMain";
 import useFunctions from "../../../hooks/useFunctions";
-import CirclePercentageBar from "../../../components/CirclePercentageBar/CirclePercentageBar";
-import DashboardLayout from "../../../layouts/DashboardLayout";
-import RegionsWidget from "../../../components/RegionsWidget/RegionsWidget";
-import CountWidget from "../../../components/CountWidget/CountWidget";
+import { useParams } from "react-router-dom";
+import useMain from "../../../hooks/useMain";
+
 export default function RoboticsCloudDashboardPage(): ReactElement {
   const [responseInstances, setResponseInstances] = useState<any[] | undefined>(
     undefined
@@ -218,13 +219,25 @@ export default function RoboticsCloudDashboardPage(): ReactElement {
                     size={46}
                   />
                   <CirclePercentageBar
-                    percentage={Number(
-                      (
-                        (rowData?.usages?.storageTotal / 100) *
-                        (rowData?.usages?.storageTotal -
-                          rowData?.usages?.storageUsage)
-                      ).toFixed()
-                    )}
+                    percentage={
+                      Number(
+                        (
+                          ((rowData?.usages?.storageTotal -
+                            rowData?.usages?.storageUsage) /
+                            rowData?.usages?.storageTotal) *
+                          100
+                        ).toFixed()
+                      ) < 1
+                        ? 1
+                        : Number(
+                            (
+                              ((rowData?.usages?.storageTotal -
+                                rowData?.usages?.storageUsage) /
+                                rowData?.usages?.storageTotal) *
+                              100
+                            ).toFixed()
+                          )
+                    }
                     title={`Storage (${rowData?.usages?.storageTotal} GB)`}
                     size={46}
                   />