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

Hide "try demo" on login page (fixes #2106) #3889

Open
wants to merge 6 commits into
base: master
Choose a base branch
from

Conversation

sammichaels
Copy link

Fixes #2106. Setting the environment variable REACT_APP_HIDE_LOGIN_DEMO to anything will prevent the "Try Demo" link from displaying on the login page.

@actual-github-bot actual-github-bot bot changed the title Hide "try demo" on login page (fixes #2106) [WIP] Hide "try demo" on login page (fixes #2106) Nov 24, 2024
Copy link

netlify bot commented Nov 24, 2024

Deploy Preview for actualbudget ready!

Name Link
🔨 Latest commit bf13c8d
🔍 Latest deploy log https://app.netlify.com/sites/actualbudget/deploys/6743a2169afcea000830a457
😎 Deploy Preview https://deploy-preview-3889.demo.actualbudget.org
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link
Contributor

github-actions bot commented Nov 24, 2024

Bundle Stats — desktop-client

Hey there, this message comes from a GitHub action that helps you and reviewers to understand how these changes affect the size of this project's bundle.

As this PR is updated, I'll keep you updated on how the bundle size is impacted.

Total

Files count Total bundle size % Changed
10 5.45 MB → 5.45 MB (+127 B) +0.00%
Changeset
File Δ Size
home/runner/work/actual/actual/packages/loot-core/src/shared/environment.ts 📈 +99 B (+26.47%) 374 B → 473 B
src/components/manager/subscribe/Login.tsx 📈 +28 B (+0.51%) 5.34 kB → 5.37 kB
View detailed bundle breakdown

Added

No assets were added

Removed

No assets were removed

Bigger

Asset File Size % Changed
static/js/index.js 3.44 MB → 3.44 MB (+127 B) +0.00%

Smaller

No assets were smaller

Unchanged

Asset File Size % Changed
static/js/workbox-window.prod.es5.js 5.69 kB 0%
static/js/indexeddb-main-thread-worker-e59fee74.js 13.5 kB 0%
static/js/resize-observer.js 18.37 kB 0%
static/js/BackgroundImage.js 122.29 kB 0%
static/js/useAccountPreviewTransactions.js 1.68 kB 0%
static/js/narrow.js 82.93 kB 0%
static/js/AppliedFilters.js 21.32 kB 0%
static/js/wide.js 241.19 kB 0%
static/js/ReportRouter.js 1.52 MB 0%

Copy link
Contributor

github-actions bot commented Nov 24, 2024

Bundle Stats — loot-core

Hey there, this message comes from a GitHub action that helps you and reviewers to understand how these changes affect the size of this project's bundle.

As this PR is updated, I'll keep you updated on how the bundle size is impacted.

Total

Files count Total bundle size % Changed
1 1.32 MB 0%
Changeset
File Δ Size
packages/loot-core/src/shared/environment.ts 📈 +109 B (+21.98%) 496 B → 605 B
View detailed bundle breakdown

Added

No assets were added

Removed

No assets were removed

Bigger

No assets were bigger

Smaller

No assets were smaller

Unchanged

Asset File Size % Changed
kcab.worker.js 1.32 MB 0%

@sammichaels sammichaels changed the title [WIP] Hide "try demo" on login page (fixes #2106) Hide "try demo" on login page (fixes #2106) Nov 24, 2024
Copy link
Contributor

coderabbitai bot commented Nov 24, 2024

Walkthrough

The changes made in this pull request involve modifications to the Login component in the Login.tsx file and the introduction of a new function in the environment.ts file. The Login component now imports the shouldDisplayLoginDemo function from the shared environment module, which determines whether to display the demo login button based on the value of the environment variable REACT_APP_HIDE_LOGIN_DEMO. This replaces the previous static rendering of the demo button with a conditional rendering approach. The functionality of the demo login button remains unchanged, allowing users to initiate a demo login through the onDemo function. Additionally, the error handling and overall structure of the Login component have not been altered. In the environment.ts file, the newly added shouldDisplayLoginDemo function checks the status of the environment variable and returns a boolean value, while existing functions in the module remain unaffected.

Assessment against linked issues

Objective Addressed Explanation
Allow hiding the "Try Demo" link using an environment variable (#[2106])

Warning

There were issues while running some tools. Please review the errors and either fix the tool’s configuration or disable the tool if it’s a critical failure.

🔧 eslint (1.23.1)

If the error stems from missing dependencies, add them to the package.json file. For unrecoverable errors (e.g., due to private dependencies), disable the tool in the CodeRabbit configuration.

packages/desktop-client/src/components/manager/subscribe/Login.tsx

Oops! Something went wrong! :(

ESLint: 8.57.1

ESLint couldn't find the plugin "eslint-plugin-eslint-plugin".

(The package "eslint-plugin-eslint-plugin" was not found when loaded as a Node module from the directory "/packages/eslint-plugin-actual".)

It's likely that the plugin isn't installed correctly. Try reinstalling by running the following:

npm install eslint-plugin-eslint-plugin@latest --save-dev

The plugin "eslint-plugin-eslint-plugin" was referenced from the config file in "packages/eslint-plugin-actual/.eslintrc.js".

If you still can't figure out the problem, please stop by https://eslint.org/chat/help to chat with the team.


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🧹 Outside diff range and nitpick comments (2)
packages/loot-core/src/shared/environment.ts (1)

21-24: Consider improving type safety and documentation.

The implementation correctly handles the hide/show logic for the demo login button. However, there are a few suggestions for improvement:

  1. Add JSDoc documentation to clarify the function's purpose and expected environment variable values
  2. Consider adding type safety for the environment variable

Here's a suggested improvement:

+/**
+ * Determines whether to display the demo login button.
+ * @returns {boolean} Returns true if demo login should be shown, false otherwise
+ * @example
+ * // To hide demo login, set in your environment:
+ * REACT_APP_HIDE_LOGIN_DEMO=true
+ */
 export function shouldDisplayLoginDemo() {
-  return process.env.REACT_APP_HIDE_LOGIN_DEMO === undefined;
+  const hideDemo = process.env.REACT_APP_HIDE_LOGIN_DEMO;
+  return hideDemo === undefined || hideDemo === '';
 }
packages/desktop-client/src/components/manager/subscribe/Login.tsx (1)

Line range hint 1-189: Consider adding documentation for self-hosted users.

While the implementation is solid, it would be helpful to add documentation explaining how to configure the REACT_APP_HIDE_LOGIN_DEMO environment variable for self-hosted instances.

Would you like me to help draft the documentation for this feature?

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between c25e3d4 and bf13c8d.

⛔ Files ignored due to path filters (1)
  • upcoming-release-notes/3889.md is excluded by !**/*.md
📒 Files selected for processing (2)
  • packages/desktop-client/src/components/manager/subscribe/Login.tsx (2 hunks)
  • packages/loot-core/src/shared/environment.ts (1 hunks)
🔇 Additional comments (2)
packages/desktop-client/src/components/manager/subscribe/Login.tsx (2)

10-10: LGTM! Clean import addition.

The import of shouldDisplayLoginDemo is well-placed and follows the project's import structure.


173-189: Clean implementation of the configurable demo button.

The conditional rendering is well-implemented and maintains the original layout while providing the requested configurability for self-hosted instances.

Let's verify the environment variable handling:

Comment on lines +22 to +24
export function shouldDisplayLoginDemo() {
return process.env.REACT_APP_HIDE_LOGIN_DEMO === undefined;
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

Environment variable needs documentation

The implementation is correctly used in the Login component to conditionally render a demo section, but the REACT_APP_HIDE_LOGIN_DEMO environment variable is not documented anywhere in the codebase. This could cause confusion for other developers.

  • Add documentation for REACT_APP_HIDE_LOGIN_DEMO environment variable in packages/desktop-client/README.md, explaining its purpose and usage
  • Consider adding a .env.example file to showcase the available environment variables
🔗 Analysis chain

Verify implementation completeness.

Let's verify the implementation and documentation:

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the implementation completeness

# Check if the function is used in the Login component
echo "Checking function usage in Login component..."
rg -l "shouldDisplayLoginDemo" "packages/desktop-client/src/components/manager/subscribe/Login"

# Check for any other usages of the function
echo "Checking for other function usages..."
rg -l "shouldDisplayLoginDemo"

# Check if environment variable is documented
echo "Checking for environment variable documentation..."
rg -l "REACT_APP_HIDE_LOGIN_DEMO" -g "*.md"
rg -l "REACT_APP_HIDE_LOGIN_DEMO" -g "*.env*"

Length of output: 875


Script:

#!/bin/bash
# Let's examine the actual usage of the function in the Login component
echo "Checking function implementation in Login.tsx..."
rg "shouldDisplayLoginDemo" packages/desktop-client/src/components/manager/subscribe/Login.tsx -A 3 -B 3

# Let's also check for any environment variable setup files
echo "Checking for environment setup files..."
fd -g ".env*"

# Check for any documentation files that might contain environment variables
echo "Checking documentation files..."
fd "README.md"

Length of output: 1254


Script:

#!/bin/bash
# Let's check the content of relevant README files for environment variable documentation
echo "Checking README files for environment documentation..."
rg "REACT_APP_HIDE_LOGIN_DEMO|environment|env" packages/desktop-client/README.md -A 3 -B 3

# Let's check with hidden files included for .env files
echo "Checking for .env files with hidden flag..."
fd -H -g ".env*"

# Let's also check the Login component to see the complete context of the demo usage
echo "Checking Login component demo section..."
rg "shouldDisplayLoginDemo" packages/desktop-client/src/components/manager/subscribe/Login.tsx -A 10 -B 3

Length of output: 2007

Copy link
Member

@UnderKoen UnderKoen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I remember correctly the loot-core is served from the browser so I would not have access to the enviroment variables set on the server. Have you tested with setting the enviroment variable on server?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Feature] Allow disable the "Try Demo" link (selfhosted)
2 participants