fix: broken update button

akash-network · Sep 28, 2023 · e416afc · e416afc
1 parent ded4890
commit e416afc
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 19 deletions.
diff --git a/web/src/api/rpc/beta3/providers.ts b/web/src/api/rpc/beta3/providers.ts
@@ -45,8 +45,11 @@ export const fetchProviderAttributes = async (
   }
 
   return client
-    .ProviderAttributes(QueryProviderAttributesRequest.fromPartial(filter));
-  // .catch((err) => ({} as QueryProvidersResponse)); // if there is no value, return empty set
+    .ProviderAttributes(QueryProviderAttributesRequest.fromPartial(filter))
+    .catch((err) => {
+      console.warn('Error fetching provider attributes', err);
+      return {} as QueryProvidersResponse;
+    }); // if there is no value, return empty set
 };
 
 export const fetchAuditorAttributes = async (

diff --git a/web/src/components/Deployment/DeploymentActionButton.tsx b/web/src/components/Deployment/DeploymentActionButton.tsx
@@ -9,10 +9,12 @@ type DeploymentActionButtonProps = {
   children: React.ReactNode;
 } & ButtonProps;
 
-const ConditionalTooltip = ({ children, condition, ...rest }: any) => {
+const ConditionalTooltip = ({ children, condition, title, to, sx }: any) => {
+  console.log('Condition', condition);
+
   return condition
-    ? <Link {...rest}>{children}</Link>
-    : <Tooltip {...rest} placement="top">{children}</Tooltip>;
+    ? <Link href={to} className='w-full'>{children}</Link>
+    : <Tooltip title={title} placement="top" sx={sx}><div className='w-full'>{children}</div></Tooltip>;
 };
 
 
@@ -37,6 +39,7 @@ const DeploymentActionButton: React.FC<DeploymentActionButtonProps> = (props) =>
         fullWidth
         variant="outlined"
         color="secondary"
+        disabled={!condition}
         sx={{
           justifyContent: 'left'
         }}

diff --git a/web/src/components/Deployment/index.tsx b/web/src/components/Deployment/index.tsx
@@ -18,12 +18,11 @@ import { uniqueName } from '../../_helpers/unique-name';
 import { Icon } from '../Icons';
 import { useLeaseStatus } from '../../hooks/useLeaseStatus';
 import InfoIcon from '@mui/icons-material/Info';
-import { fetchDeployment as beta2FetchDeployment } from '../../api/rpc/beta2/deployments';
 import { fetchDeployment as beta3FetchDeployment } from '../../api/rpc/beta3/deployments';
 import { getRpcNode } from '../../hooks/useRpcNode';
 
 import { QueryDeploymentResponse as Beta3Deployment } from '@akashnetwork/akashjs/build/protobuf/akash/deployment/v1beta3/query';
-import { QueryDeploymentResponse as Beta2Deployment } from '@akashnetwork/akashjs/build/protobuf/akash/deployment/v1beta2/query';
+
 import DeploymentActionButton from './DeploymentActionButton';
 
 const Deployment: React.FC<any> = () => {
@@ -193,6 +192,8 @@ const Deployment: React.FC<any> = () => {
         }
       }
     }
+
+    console.log('leaseStatus', leaseStatus);
   }, [leaseStatus]);
 
   React.useEffect(() => {
@@ -207,14 +208,16 @@ const Deployment: React.FC<any> = () => {
     navigate(`/configure-deployment/${dseq}`);
   };
 
+  const onUpdateDeployment = () => {
+    navigate(`/my-deployments/${dseq}/update-deployment`);
+  };
+
   // In case that current SDL is deployed from another machine, only show Tooltip and not show re-deploy page
   const ConditionalLinkReDeploy = application !== null ? Link : Tooltip;
 
   // In case that current SDL is deployed from another machine or status closed, only show Tooltip and not show update page
   const canUpdate = application !== null && deployment?.deployment?.state === 1;
 
-  console.log('Can Update', canUpdate);
-
   return (
     <Stack>
       {certificate.$type === 'Invalid Certificate' && (
@@ -274,7 +277,7 @@ const Deployment: React.FC<any> = () => {
                         : 'This SDL is deployed with another tool and can\'t be updated from here'
                       }
                       tooltip={UpdateDeploymentTooltip}
-                      linkTo={'update-deployment'}
+                      linkTo={`/my-deployments/${dseq}/update-deployment`}
                       aria-label="update deployment"
                       aria-controls="menu-appbar"
                       aria-haspopup="true"
@@ -296,6 +299,7 @@ const Deployment: React.FC<any> = () => {
                           variant="outlined"
                           color="secondary"
                           aria-label="re-deploy"
+                          disabled={!canUpdate}
                           sx={{
                             justifyContent: 'left'
                           }}

diff --git a/web/src/hooks/useDeploymentData.ts b/web/src/hooks/useDeploymentData.ts
@@ -136,14 +136,18 @@ export default function useDeploymentData(owner: string) {
             if (status === undefined || status === '') {
               console.warn('Unable to resolve lease status for deployment:', dseq);
             } else {
-              const leaseStatus = await status.json() as any;
-
-              if (leaseStatus && leaseStatus.services) {
-                url = Object.values(leaseStatus.services)
-                  .map((service) => (service as any).uris)
-                  .filter((uri) => uri && uri[0])
-                  .map((uri) => uri[0])
-                  .join(', ');
+              try {
+                const leaseStatus = await status.json() as any;
+
+                if (leaseStatus && leaseStatus.services) {
+                  url = Object.values(leaseStatus.services)
+                    .map((service) => (service as any).uris)
+                    .filter((uri) => uri && uri[0])
+                    .map((uri) => uri[0])
+                    .join(', ');
+                }
+              } catch (e) {
+                console.warn('Unable to parse lease status', e);
               }
             }
           }

diff --git a/web/src/pages/SelectProvider.tsx b/web/src/pages/SelectProvider.tsx
@@ -9,7 +9,6 @@ import { useQuery } from 'react-query';
 import { WordSwitch } from '../components/Switch/WordSwitch';
 import { Timer } from '../components/Timer';
 import { PlaceholderCard } from '../components/PlaceholderCard';
-import { getRpcNode } from '../hooks/useRpcNode';
 
 export interface SelectProviderProps {
   deploymentId: { owner: string; dseq: string };