fix app name and messages

Author: justin808

.github/workflows/deploy-to-control-plane-review-app.yml

@@ -139,9 +139,9 @@ jobs:
             fi
           fi
           
-          # Extract and set PR data
+          # Set PR_NUMBER and override APP_NAME with validated PR number
           echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_ENV
-          echo "APP_NAME=${{ vars.REVIEW_APP_PREFIX }}-$PR_NUMBER" >> $GITHUB_ENV
+          echo "APP_NAME=${{ vars.REVIEW_APP_PREFIX }}-pr-$PR_NUMBER" >> $GITHUB_ENV
           echo "PR_REF=$(echo $PR_DATA | jq -r .headRefName)" >> $GITHUB_OUTPUT
           echo "PR_SHA=$(echo $PR_DATA | jq -r .headRefOid)" >> $GITHUB_ENV
 
@@ -233,7 +233,11 @@ jobs:
               body: [
                 `🏗️ Building Docker image for PR [#${process.env.PR_NUMBER}](${process.env.GITHUB_SERVER_URL}/${context.repo.owner}/${context.repo.repo}/pull/${process.env.PR_NUMBER}), commit [${context.sha.substring(0, 7)}](${process.env.GITHUB_SERVER_URL}/${context.repo.owner}/${context.repo.repo}/commit/${context.sha})`,
                 '',
-                `📝 [View Build Logs](${process.env.GITHUB_SERVER_URL}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}/job/${context.job})`,
+                '🚀 Deploying to Control Plane...',
+                '',
+                '⏳ Waiting for deployment to be ready...',
+                '',
+                `📝 [View Build and Deploy Logs](${process.env.GITHUB_SERVER_URL}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}/job/${context.job})`,
                 '',
                 process.env.CONSOLE_LINK
               ].join('\n')
@@ -350,22 +354,7 @@ jobs:
         uses: actions/github-script@v7
         with:
           script: |
-            const deployingMessage = [
-              '🚀 Deploying to Control Plane...',
-              '',
-              '⏳ Waiting for deployment to be ready...',
-              '',
-              '📝 [View Deploy Logs](${{ env.WORKFLOW_URL }})',
-              '',
-              process.env.CONSOLE_LINK
-            ].join('\n');
-            
-            await github.rest.issues.updateComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              comment_id: ${{ needs.build.outputs.comment_id }},
-              body: deployingMessage
-            });
+            // Remove this step since we're combining messages
 
       - name: Deploy to Control Plane
         if: env.DO_DEPLOY != 'false'
@@ -410,21 +399,25 @@ jobs:
               '🚀 [Review App for PR #' + prNumber + '](' + appUrl + ')',
               consoleLink,
               '',
-              '📋 [View Completed Action Build and Deploy Logs](' + workflowUrl + ')'
+              '📝 [View Build and Deploy Logs](' + workflowUrl + ')',
+              '',
+              `📋 [View Completed Build and Deploy Logs](${process.env.GITHUB_SERVER_URL}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}/jobs/${context.job.id})`
             ].join('\n');
             
             const failureMessage = [
               '❌ Deployment failed for PR #' + prNumber + ', commit ' + '${{ env.PR_SHA }}',
               '',
               consoleLink,
               '',
-              '📋 [View Deployment Logs with Errors](' + workflowUrl + ')'
+              '📝 [View Build and Deploy Logs](' + workflowUrl + ')',
+              '',
+              `📋 [View Build and Deploy Logs with Errors](${process.env.GITHUB_SERVER_URL}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}/jobs/${context.job.id})`
             ].join('\n');
             
             // Update the existing comment
             await github.rest.issues.updateComment({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              comment_id: ${{ steps.create-comment.outputs.comment-id }},
+              comment_id: ${{ needs.build.outputs.comment_id }},
               body: isSuccess ? successMessage : failureMessage
             });