fix updates after promotion

AP-Sensing · Nov 9, 2024 · ed5bdf9 · ed5bdf9
1 parent 361654e
commit ed5bdf9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/core/OSTreeTUI.cpp b/src/core/OSTreeTUI.cpp
@@ -48,7 +48,6 @@ OSTreeTUI::OSTreeTUI (const std::string& repo, const std::vector<std::string> st
 	 * For a general list of To-Dos refer to https://github.com/AP-Sensing/ostree-tui/pull/21
 	 *
 	 * TODO bug fixes:
-	 * 		> updates (update commit-list when promoting)
 	 * 		> keyboard functionality (especially in-app navigation)
 	 */
 
@@ -94,12 +93,12 @@ OSTreeTUI::OSTreeTUI (const std::string& repo, const std::vector<std::string> st
 			return true;
     	}
 		// switch through commits
-    	if (event == Event::ArrowUp || event == Event::Character('k')) {
+    	if (event == Event::ArrowUp) {
 			scrollOffset = std::min(0, scrollOffset + 4);
 			selectedCommit = -scrollOffset / 4;
 			return true;
     	}
-    	if (event == Event::ArrowDown || event == Event::Character('j')) {
+    	if (event == Event::ArrowDown) {
     	  	scrollOffset -= 4;
 			selectedCommit = -scrollOffset / 4;
 			return true;
@@ -160,10 +159,9 @@ OSTreeTUI::OSTreeTUI (const std::string& repo, const std::vector<std::string> st
     	  	return true;
     	}
 		// refresh repository
-		if (event == Event::AltR || refresh) {
+		if (event == Event::AltR) {
 			refresh_repository();
 			notificationText = " Refreshed Repository Data ";
-			refresh = false;
 			return true;
 		}
 		// exit

diff --git a/src/core/OSTreeTUI.hpp b/src/core/OSTreeTUI.hpp
@@ -74,11 +74,9 @@ class OSTreeTUI {
     // view states
     int scrollOffset{0};
     bool inPromotionSelection{false};
-	bool refresh{false};
 	std::string promotionHash{""};
 	std::string promotionBranch{""};
 
-private:
     // view constants
     int logSize{45};
   	int footerSize{1};

diff --git a/src/core/commit.cpp b/src/core/commit.cpp
@@ -154,7 +154,9 @@ class CommitComponentImpl : public ComponentBase, public WindowOptions {
 				ostreetui.ostreeRepo.promoteCommit(hash, ostreetui.promotionBranch, {}, newSubject, true);
         	    resetWindow();
 				ostreetui.inPromotionSelection = false;
-        	    ostreetui.refresh = true;
+        	    ostreetui.scrollOffset = 0;
+				ostreetui.selectedCommit = 0;
+				ostreetui.screen.PostEvent(Event::AltR);
 				return true;
 			}
 			// cancel
@@ -336,7 +338,9 @@ class CommitComponentImpl : public ComponentBase, public WindowOptions {
 				}
 	            ostreetui.ostreeRepo.promoteCommit(hash, ostreetui.promotionBranch, metadataStrings, newSubject, true);
 	            resetWindow();
-	            ostreetui.refresh = true;
+				ostreetui.scrollOffset = 0;
+				ostreetui.selectedCommit = 0;
+				ostreetui.screen.PostEvent(Event::AltR);
 	        }) | color(Color::Green) | flex,
 	    })
 	});