Преглед изворни кода

fix stuck on loading on pr env screen

Alexander Belanger пре 4 година
родитељ
комит
c90891ee67

+ 12 - 6
dashboard/src/main/home/cluster-dashboard/dashboard/preview-environments/EnvironmentList.tsx

@@ -109,14 +109,20 @@ const EnvironmentList = () => {
           throw Error("Data is not an array");
         }
 
-        let result: PRDeployment[] = [];
+        // console.log("DATA IS", data);
 
-        data.forEach((d) => {
-          result.concat(d);
-        });
+        // let result: PRDeployment[] = [];
 
-        console.log("result", result);
-        setDeploymentList(result);
+        // data.forEach((d) => {
+        //   console.log("CONCATTT", d);
+        //   result.concat(d);
+        // });
+
+        // console.log("result", result);
+
+        console.log("set deployment list", data);
+        setDeploymentList(data);
+        setIsLoading(false);
       })
       .catch((err) => {
         console.error(err);

+ 1 - 1
internal/repository/gorm/environment.go

@@ -79,7 +79,7 @@ func (repo *EnvironmentRepository) ReadDeployment(environmentID uint, namespace
 func (repo *EnvironmentRepository) ListDeploymentsByCluster(projectID, clusterID uint) ([]*models.Deployment, error) {
 	depls := make([]*models.Deployment, 0)
 
-	if err := repo.db.Order("deployments.id asc").Joins("join environments on project_id = ? AND cluster_id = ? AND environments.id = deployments.environment_id", projectID, clusterID).Find(&depls).Error; err != nil {
+	if err := repo.db.Debug().Order("deployments.id asc").Joins("join environments on project_id = ? AND cluster_id = ? AND environments.id = deployments.environment_id", projectID, clusterID).Find(&depls).Error; err != nil {
 		return nil, err
 	}