Merge branch 'main' of https://github.com/shuffle/shuffle-shared

Author: frikky

db-connector.go

@@ -8058,9 +8058,11 @@ func ListWorkflowRevisions(ctx context.Context, originalId string, amount int) (
 	} else {
 		query := datastore.NewQuery(nameKey).Filter("id =", originalId)
 		// if project.Environment == "cloud" {
-		query = query.Order("-edited").Limit(amount)
+		query = query.Order("-edited")
 		// }
 
+		iterCount := 0
+
 		cursorStr := ""
 		for {
 			it := project.Dbclient.Run(ctx, query)
@@ -8076,7 +8078,15 @@ func ListWorkflowRevisions(ctx context.Context, originalId string, amount int) (
 					}
 				}
 
+				iterCount++;
 				workflows = append(workflows, innerWorkflow)
+				if iterCount >= amount {
+					break
+				}
+			}
+
+			if iterCount >= amount {
+				break
 			}
 
 			if err != iterator.Done {

shared.go

@@ -6964,8 +6964,6 @@ func diffWorkflows(oldWorkflow Workflow, parentWorkflow Workflow, update bool) {
 
 					action.Parameters = finalParamters
 
-					// the updated action is given the right authentication ID every time.
-					log.Printf("[DEBUG] Authentication ID that's literally being passed in: %s", action.AuthenticationId)
 					childWorkflow.Actions[index] = action
 					break
 				}
@@ -28945,8 +28943,19 @@ func GetWorkflowRevisions(resp http.ResponseWriter, request *http.Request) {
 		}
 	}
 
+	revisionCount := 50
+	if request.URL.Query().Get("count") != "" {
+		revisionCount, err = strconv.Atoi(request.URL.Query().Get("count"))
+		if err != nil {
+			log.Printf("[WARNING] Failed converting count to int: %s", err)
+			resp.WriteHeader(400)
+			resp.Write([]byte(`{"success": false, "reason": "Failed converting count to int"}`))
+			return
+		}
+	}
+
 	// Access is granted -> get revisions
-	revisions, err := ListWorkflowRevisions(ctx, workflow.ID, 50)
+	revisions, err := ListWorkflowRevisions(ctx, workflow.ID, revisionCount)
 	if err != nil {
 		log.Printf("[WARNING] Failed getting revisions for workflow %s: %s", workflow.ID, err)
 		resp.WriteHeader(400)