Merge pull request #2 from atlanhq/atlan/beta

Atlan/beta - main

Author: anurag-atlan

.github/workflows/chart-release-dispatcher.yaml

@@ -21,18 +21,22 @@ jobs:
       - name: Get branch name
         id: extract_branch
         run: |
-          echo "branch=${{ github.event.workflow_run.head_branch }}" >> $GITHUB_OUTPUT
+          branch="${{ github.event.workflow_run.head_branch }}"
+          # atlan/beta -> beta, atlan/main -> main (for atlan repo)
+          echo "dispatch_branch=${branch#atlan/}" >> $GITHUB_OUTPUT
+          # keep original branch for checkout in this repo
+          echo "source_branch=${branch}" >> $GITHUB_OUTPUT
 
       - uses: actions/checkout@v4
         with:
           token: ${{ secrets.ORG_PAT_GITHUB }}
-          ref: ${{ steps.extract_branch.outputs.branch }}
+          ref: ${{ steps.extract_branch.outputs.source_branch }}
           fetch-depth: 0
 
       - name: Get SHA of the branch
         id: get_sha
         run: |
-          branch_name=${{ steps.extract_branch.outputs.branch }}
+          branch_name=${{ steps.extract_branch.outputs.source_branch }}
           sha=$(git rev-parse "refs/heads/$branch_name")
           echo "GIT_SHA: $sha"
           echo "sha=${sha}" >> $GITHUB_OUTPUT
@@ -63,7 +67,7 @@ jobs:
             {
               "repo": {
                 "name": "${{ steps.extract_repo_name.outputs.repo_name }}",
-                "branch": "${{ steps.extract_branch.outputs.branch }}",
+                "branch": "${{ steps.extract_branch.outputs.dispatch_branch }}",
                 "pr_url": "${{ steps.get_pr_url_user.outputs.pr_url }}",
                 "pr_user": "${{ steps.get_pr_url_user.outputs.pr_user }}"
               }

web/src/Modal.jsx

@@ -4,6 +4,8 @@ import { XMarkIcon } from '@heroicons/react/24/outline';
 export function Modal(props) {
   const { stopHandler, navBar, children } = props;
   const logsEndRef = useRef(null);
+  const scrollContainerRef = useRef(null);
+  const isUserNearBottom = useRef(true);
 
   useEffect(() => {
     document.body.style.overflow = 'hidden';
@@ -13,9 +15,19 @@ export function Modal(props) {
   }, []);
 
   useEffect(() => {
-    logsEndRef.current.scrollIntoView();
+    if (isUserNearBottom.current) {
+      logsEndRef.current.scrollIntoView();
+    }
   }, [children]);
 
+  const handleScroll = () => {
+    const container = scrollContainerRef.current;
+    if (!container) return;
+    const threshold = 50;
+    isUserNearBottom.current =
+      container.scrollHeight - container.scrollTop - container.clientHeight < threshold;
+  };
+
   return (
     <div
       className="fixed flex inset-0 z-10 bg-gray-500 bg-opacity-75"
@@ -35,7 +47,7 @@ export function Modal(props) {
             </button>
           </div>
           <nav>{navBar}</nav>
-          <div className="h-full relative overflow-y-auto p-4 bg-slate-800 rounded-b-lg font-normal">
+          <div ref={scrollContainerRef} onScroll={handleScroll} className="h-full relative overflow-y-auto p-4 bg-slate-800 rounded-b-lg font-normal">
             {children}
             <p ref={logsEndRef} />
           </div>