Browse Source

Merge branch 'staging' of github.com:porter-dev/porter into staging

Stefan McShane 3 năm trước cách đây
mục cha
commit
7ff96deb04

+ 4 - 2
dashboard/src/components/ProvisionerSettings.tsx

@@ -104,8 +104,10 @@ const ProvisionerForm: React.FC<Props> = ({
 
   useEffect(() => {
     setIsReadOnly(
-      currentCluster.status === "UPDATING" || 
-      currentCluster.status === "UPDATING_UNAVAILABLE"
+      clusterId && (
+        currentCluster.status === "UPDATING" || 
+        currentCluster.status === "UPDATING_UNAVAILABLE"
+      )
     );
   }, []);
 

+ 4 - 1
dashboard/src/main/home/dashboard/ClusterList.tsx

@@ -25,6 +25,7 @@ const ClusterList: React.FC<Props> = ({}) => {
       { id: currentProject.id },
     )
       .then(({ data }) => {
+        console.log(data);
         setClusters(data);
         setIsLoading(false);
       })
@@ -116,7 +117,9 @@ const ClusterList: React.FC<Props> = ({}) => {
                   {renderIcon()}
                   {cluster.name}
                   {
-                    cluster.status === "UPDATING" && (
+                    (
+                      cluster.status === "UPDATING" || cluster.status === "UPDATING_UNAVAILABLE"
+                    ) && (
                       <Status
                         onClick={(e) => {
                           e.stopPropagation();