Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: editor crashing #1582

Merged
merged 1 commit into from
Nov 6, 2023
Merged

fix: editor crashing #1582

merged 1 commit into from
Nov 6, 2023

Conversation

Dhruwang
Copy link
Contributor

@Dhruwang Dhruwang commented Nov 6, 2023

What does this PR do?

Fixes # (issue)

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • Chore (refactoring code, technical debt, workflow improvements)
  • Enhancement (small improvements)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change adds a new database migration
  • This change requires a documentation update

How should this be tested?

  • Test A
  • Test B

Checklist

Required

  • Filled out the "How to test" section in this PR
  • Read How we Code at Formbricks
  • Self-reviewed my own code
  • Commented on my code in hard-to-understand bits
  • Ran pnpm build
  • Checked for warnings, there are none
  • Removed all console.logs
  • Merged the latest changes from main onto my branch with git pull origin main
  • My changes don't cause any responsiveness issues
  • First PR at Formbricks? Please sign the CLA! Without it we wont be able to merge it 🙏

Appreciated

  • If a UI change was made: Added a screen recording or screenshots to this PR
  • Updated the Formbricks Docs if changes were necessary

Copy link

vercel bot commented Nov 6, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

2 Ignored Deployments
Name Status Preview Updated (UTC)
formbricks-cloud ⬜️ Ignored (Inspect) Nov 6, 2023 10:31am
formbricks-com ⬜️ Ignored (Inspect) Nov 6, 2023 10:31am

Copy link
Contributor

github-actions bot commented Nov 6, 2023

Thank you for following the naming conventions for pull request titles! 🙏

Copy link
Contributor

packages/surveys/src/components/ProgressBar.tsx

The calculateProgress function is quite complex and could be refactored for better readability and performance. Instead of using the findIndex method twice, you can use it once and store the result in a variable. Also, the getLastQuestionIndex function can be simplified by using the findLastIndex method.
Create Issue

    function calculateProgress(questionId: string, survey: TSurveyWithTriggers, progress: number) {
      if (survey.questions.length === 0) return 0;
      if (questionId === "end") return 1;

      let currentQuestionIdx = survey.questions.findIndex((e) => e.id === questionId);
      if (progress > 0 && currentQuestionIdx === prevQuestionIdx) return progress;
      if (currentQuestionIdx === -1) currentQuestionIdx = 0;
      const currentQuestion = survey.questions[currentQuestionIdx];
      const surveyLength = survey.questions.length;
      const middleIdx = Math.floor(surveyLength / 2);
      const possibleNextQuestions = currentQuestion.logic?.map((l) => l.destination) || [];

      const getLastQuestionIndex = () => {
        return survey.questions.findLastIndex((q) => possibleNextQuestions.includes(q.id));
      };

      let elementIdx = currentQuestionIdx || 0.5;
      const lastQuestionIdx = getLastQuestionIndex();

      if (lastQuestionIdx > 0) elementIdx = Math.min(middleIdx, lastQuestionIdx - 1);
      if (possibleNextQuestions.includes("end")) elementIdx = middleIdx;

      const newProgress = elementIdx / survey.questions.length;

      // Determine if user went backwards in the survey
      const didUserGoBackwards = currentQuestionIdx < prevQuestionIdx;

      // Update the progress array based on user's navigation
      let updatedProgress = progress;
      if (didUserGoBackwards) {
        updatedProgress = progress - (prevQuestionIdx - currentQuestionIdx) * PROGRESS_INCREMENT;
      } else if (newProgress > progress) {
        updatedProgress = newProgress;
      } else if (newProgress <= progress && progress + PROGRESS_INCREMENT <= 1) {
        updatedProgress = progress + PROGRESS_INCREMENT;
      }

      setPrevQuestionIdx(currentQuestionIdx);
      return updatedProgress;
    }

@mattinannt mattinannt self-assigned this Nov 6, 2023
@mattinannt mattinannt added this pull request to the merge queue Nov 6, 2023
Merged via the queue into main with commit 9d0b6ce Nov 6, 2023
14 checks passed
@mattinannt mattinannt deleted the pb-issue branch November 6, 2023 10:45
kevinkong91 added a commit to kevinkong91/formbricks that referenced this pull request Nov 7, 2023
* main: (42 commits)
  chore: add revert to oss-friends (formbricks#745)
  fix: pass authOptions to getServerSession in authLayout (formbricks#1584)
  fix: fixed URL example for "Create Survey" API endpoint is wrong formbricks#1555 (formbricks#1586)
  fix(docs): default account info docs changes (formbricks#1583)
  chore: Add docker packages to Github Packages on release (formbricks#1585)
  feat: avatar upload (formbricks#1546)
  fix: editor crashing (formbricks#1582)
  fix: Add scroll to the setting navbar  (formbricks#1398)
  are you sure modal missing fix:formbricks#1419 (formbricks#1485)
  fix: github linting issues (formbricks#1510)
  refactor: added authorization to airtable integration and create a common actions file (formbricks#1538)
  docs: add docs for airtable (formbricks#1541)
  fix: missing static generation store in revalidation due to pages dir (formbricks#1581)
  feat: Pagination for other values in multi choice (formbricks#1560)
  feat:  $199 pricing model for unlimited plans (formbricks#1564)
  fix: make pricing pages consistent (formbricks#1567)
  fix: openText issue (formbricks#1579)
  fix: avoid blocking the request if it does not have an associated ip (formbricks#1540)
  feat: Add Unkey to OSS Friends (formbricks#1574)
  feat: FOR-683 Role Switch (formbricks#1450)
  ...
kevinkong91 added a commit to kevinkong91/formbricks that referenced this pull request Nov 7, 2023
* main: (70 commits)
  chore: add revert to oss-friends (formbricks#745)
  fix: pass authOptions to getServerSession in authLayout (formbricks#1584)
  fix: fixed URL example for "Create Survey" API endpoint is wrong formbricks#1555 (formbricks#1586)
  fix(docs): default account info docs changes (formbricks#1583)
  chore: Add docker packages to Github Packages on release (formbricks#1585)
  feat: avatar upload (formbricks#1546)
  fix: editor crashing (formbricks#1582)
  fix: Add scroll to the setting navbar  (formbricks#1398)
  are you sure modal missing fix:formbricks#1419 (formbricks#1485)
  fix: github linting issues (formbricks#1510)
  refactor: added authorization to airtable integration and create a common actions file (formbricks#1538)
  docs: add docs for airtable (formbricks#1541)
  fix: missing static generation store in revalidation due to pages dir (formbricks#1581)
  feat: Pagination for other values in multi choice (formbricks#1560)
  feat:  $199 pricing model for unlimited plans (formbricks#1564)
  fix: make pricing pages consistent (formbricks#1567)
  fix: openText issue (formbricks#1579)
  fix: avoid blocking the request if it does not have an associated ip (formbricks#1540)
  feat: Add Unkey to OSS Friends (formbricks#1574)
  feat: FOR-683 Role Switch (formbricks#1450)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants