refactor: Update conditional logic for displaying forum link and test…

… runner card visibility

app/components/course-page/course-stage-step/first-stage-tutorial-card.hbs

@@ -23,13 +23,13 @@
       {{else if (eq stepList.expandedStep.id "submit-code")}}
         <CoursePage::CourseStageStep::FirstStageTutorialCard::SubmitCodeStep
           @isComplete={{this.submitCodeStepIsComplete}}
-          @shouldHideTestRunnerCardBeforeUserHasSubmitted={{@shouldHideTestRunnerCardBeforeUserHasSubmitted}}
+          @shouldHideTestRunnerCardRelatedCopy={{@shouldHideTestRunnerCardRelatedCopy}}
         />
       {{/if}}
     </ExpandableStepList>
 
-    {{#if @shouldHideTestRunnerCardBeforeUserHasSubmitted}}
-      {{#if @shouldShowLinkToForum}}
+    {{#if @shouldHideTestRunnerCardRelatedCopy}}
+      {{#if this.shouldShowLinkToForum}}
         <div class="prose dark:prose-invert prose-sm prose-compact mt-6">
           <p>Need help?</p>
           <ul>
@@ -40,7 +40,7 @@
                 rel="noopener noreferrer"
               >
                 Post your issue</a>
-              on the forum—Andy is quick to reply, typically within 6 hours.
+              on the forum — Andy usually replies within 6 hours.
             </li>
           </ul>
         </div>

app/components/course-page/course-stage-step/first-stage-tutorial-card.ts

@@ -4,6 +4,7 @@ import CoursePageStateService from 'codecrafters-frontend/services/course-page-s
 import FeatureFlagsService from 'codecrafters-frontend/services/feature-flags';
 import Store from '@ember-data/store';
 import type CourseStageModel from 'codecrafters-frontend/models/course-stage';
+import type CourseStageStep from 'codecrafters-frontend/utils/course-page-step-list/course-stage-step';
 import type RepositoryModel from 'codecrafters-frontend/models/repository';
 import type { Step } from 'codecrafters-frontend/components/expandable-step-list';
 import { action } from '@ember/object';
@@ -14,8 +15,8 @@ interface Signature {
   Args: {
     repository: RepositoryModel;
     courseStage: CourseStageModel;
-    shouldHideTestRunnerCardBeforeUserHasSubmitted: boolean;
-    shouldShowLinkToForum: boolean;
+    currentStep: CourseStageStep;
+    shouldHideTestRunnerCardRelatedCopy: boolean;
   };
 }
 
@@ -84,6 +85,12 @@ export default class FirstStageTutorialCardComponent extends Component<Signature
     return this.coursePageState.manuallyCompletedStepIdsInFirstStageInstructions.includes('navigate-to-file');
   }
 
+  get shouldShowLinkToForum() {
+    const currentStep = this.args.currentStep;
+
+    return currentStep.testsStatus !== 'passed' && currentStep.status !== 'complete';
+  }
+
   get steps() {
     return [
       new NavigateToFileStep(this.args.repository, this.navigateToFileStepIsComplete),

app/components/course-page/course-stage-step/first-stage-tutorial-card/submit-code-step.hbs

@@ -8,7 +8,7 @@
 
 <div class="prose dark:prose-invert">
   <p class={{if @isComplete "line-through"}}>
-    Once you run the commands above, our system will automatically run tests on your code.
+    Once you run the commands above, our system will automatically test your code.
   </p>
 
   {{#if @isComplete}}
@@ -20,7 +20,7 @@
 </div>
 
 {{#unless @isComplete}}
-  {{#unless @shouldHideTestRunnerCardBeforeUserHasSubmitted}}
+  {{#unless @shouldHideTestRunnerCardRelatedCopy}}
     <p class="prose dark:prose-invert prose-sm mt-3">
       <b>Note:</b>
       If you're still seeing "Tests failed" after completing the steps above,

app/components/course-page/course-stage-step/first-stage-tutorial-card/submit-code-step.ts

@@ -8,7 +8,7 @@ interface Signature {
 
   Args: {
     isComplete: boolean;
-    shouldHideTestRunnerCardBeforeUserHasSubmitted: boolean;
+    shouldHideTestRunnerCardRelatedCopy: boolean;
   };
 }
 

app/controllers/course/stage/instructions.ts

@@ -48,32 +48,34 @@ export default class CourseStageInstructionsController extends Controller {
     return this.model.courseStage.prerequisiteInstructionsMarkdownFor(this.model.activeRepository);
   }
 
-  get shouldHideTestRunnerCardBeforeUserHasSubmitted() {
-    return this.featureFlags.hideTestRunnerCardBeforeUserHasSubmitted;
+  get shouldHideTestRunnerCardBeforeStage1Submission() {
+    return this.featureFlags.cannotSeeTestRunnerCardBeforeStage1Submission;
   }
 
   get shouldShowFeedbackPrompt() {
     return !this.currentStep.courseStage.isFirst && this.currentStep.status === 'complete';
   }
 
-  get shouldShowLinkToForum() {
-    return (
-      this.isCurrentStage &&
-      this.currentStep.status !== 'complete' &&
-      this.currentStep.testsStatus !== 'passed' &&
-      this.shouldHideTestRunnerCardBeforeUserHasSubmitted
-    );
-  }
-
   get shouldShowPrerequisites() {
     return !!this.prerequisiteInstructionsMarkdown;
   }
 
   get shouldShowTestRunnerCard() {
-    const shouldHideTestRunnerCard =
-      this.model.courseStage.isFirst && this.model.activeRepository.submissions.length <= 1 && this.shouldHideTestRunnerCardBeforeUserHasSubmitted;
+    if (!this.isCurrentStage) {
+      return false;
+    }
 
-    return this.isCurrentStage && this.currentStep.status !== 'complete' && !shouldHideTestRunnerCard;
+    if (this.currentStep.status === 'complete') {
+      return false;
+    }
+
+    if (this.model.courseStage.isFirst) {
+      // For stage 1, we hide the test runner card until the user's submission.
+      return !(this.model.activeRepository.submissionsCount <= 1 && this.shouldHideTestRunnerCardBeforeStage1Submission);
+    } else {
+      // For other stages, we always show the test runner card
+      return true;
+    }
   }
 
   get shouldShowUpgradePrompt() {

app/services/feature-flags.js

@@ -18,12 +18,12 @@ export default class FeatureFlagsService extends Service {
     return this.currentUser?.isStaff || this.getFeatureFlagValue('can-see-short-instructions-for-stage-2') === 'test';
   }
 
-  get currentUser() {
-    return this.authenticator.currentUser;
+  get cannotSeeTestRunnerCardBeforeStage1Submission() {
+    return this.currentUser?.isStaff || this.getFeatureFlagValue('cannot-see-test-runner-card-before-stage1-submission') === 'test';
   }
 
-  get hideTestRunnerCardBeforeUserHasSubmitted() {
-    return this.currentUser?.isStaff || this.getFeatureFlagValue('hide-test-runner-card-before-user-has-submitted') === 'test';
+  get currentUser() {
+    return this.authenticator.currentUser;
   }
 
   getFeatureFlagValue(flagName) {

app/templates/course/stage/instructions.hbs

@@ -36,8 +36,8 @@
       <CoursePage::CourseStageStep::FirstStageTutorialCard
         @repository={{@model.activeRepository}}
         @courseStage={{@model.courseStage}}
-        @shouldHideTestRunnerCardBeforeUserHasSubmitted={{this.shouldHideTestRunnerCardBeforeUserHasSubmitted}}
-        @shouldShowLinkToForum={{this.shouldShowLinkToForum}}
+        @currentStep={{this.currentStep}}
+        @shouldHideTestRunnerCardRelatedCopy={{this.shouldHideTestRunnerCardBeforeStage1Submission}}
         class="mb-6"
       />
     {{/if}}