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

Added link button to CTA Card toolbar #1441

Merged
merged 3 commits into from
Feb 12, 2025
Merged

Added link button to CTA Card toolbar #1441

merged 3 commits into from
Feb 12, 2025

Conversation

ronaldlangeveld
Copy link
Member

@ronaldlangeveld ronaldlangeveld commented Feb 10, 2025

ref https://linear.app/ghost/issue/PLG-329/add-ability-to-add-url-to-cta-card

  • Added a new href node property to the CTA Node
  • wired up the href node prop to Koenig-Lexcal
  • Implemented an add link Action button in the toolbar.

ref https://linear.app/ghost/issue/PLG-329/add-ability-to-add-url-to-cta-card

- Added a new href node property to the CTA Node
- wired up the href node prop to Koenig-Lexcal
- Implemented a add link Action Toolbar
Copy link

coderabbitai bot commented Feb 10, 2025

Walkthrough

The changes introduce a new property, href, across multiple components managing Call To Action functionality. In the core CallToActionNode class, the href property is added to its properties configuration, allowing hyperlink references. Corresponding updates in tests ensure that the href property is initialized, manipulated, and included in JSON exports and imports. Additionally, the Koenig-Lexical components have been enhanced to handle the href property in their props and state, featuring new functions for managing link selection and input display. A new end-to-end test verifies that the CTA card toolbar now includes a Link button that reveals a link input when activated.

Possibly related PRs

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

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/koenig-lexical/src/nodes/CallToActionNode.jsx

Oops! Something went wrong! :(

ESLint: 8.57.0

ESLint couldn't find the config "react-app" to extend from. Please check that the name of the config is correct.

The config "react-app" was referenced from the config file in "/packages/koenig-lexical/.eslintrc.cjs".

If you still have problems, please stop by https://eslint.org/chat/help to chat with the team.

packages/koenig-lexical/src/nodes/CallToActionNodeComponent.jsx

Oops! Something went wrong! :(

ESLint: 8.57.0

ESLint couldn't find the config "react-app" to extend from. Please check that the name of the config is correct.

The config "react-app" was referenced from the config file in "/packages/koenig-lexical/.eslintrc.cjs".

If you still have problems, please stop by https://eslint.org/chat/help to chat with the team.

packages/koenig-lexical/test/e2e/cards/cta-card.test.js

Oops! Something went wrong! :(

ESLint: 8.57.0

ESLint couldn't find the config "react-app" to extend from. Please check that the name of the config is correct.

The config "react-app" was referenced from the config file in "/packages/koenig-lexical/.eslintrc.cjs".

If you still have problems, please stop by https://eslint.org/chat/help to chat with the team.

  • 1 others
✨ Finishing Touches
  • 📝 Generate Docstrings (Beta)

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 generate docstrings to generate docstrings for this PR. (Beta)
  • @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

@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: 0

🧹 Nitpick comments (4)
packages/koenig-lexical/src/nodes/CallToActionNodeComponent.jsx (2)

119-125: Consider memoizing the reselectCTACard function.

Since this function is used in callbacks, memoizing it with useCallback would prevent unnecessary recreations.

-    const reselectCTACard = () => {
+    const reselectCTACard = React.useCallback(() => {
         editor.update(() => {
             const nodeSelection = $createNodeSelection();
             nodeSelection.add(nodeKey);
             $setSelection(nodeSelection);
         });
-    };
+    }, [editor, nodeKey]);

132-137: Add URL validation to setHref function.

Consider validating URLs before updating the href property to ensure only valid URLs are stored.

-    const setHref = (newHref) => {
+    const setHref = (newHref) => {
+        // Skip empty URLs
+        if (!newHref) {
+            editor.update(() => {
+                const node = $getNodeByKey(nodeKey);
+                node.href = '';
+            });
+            return;
+        }
+
+        try {
+            // Validate URL
+            new URL(newHref);
+            editor.update(() => {
+                const node = $getNodeByKey(nodeKey);
+                node.href = newHref;
+            });
+        } catch (e) {
+            // Handle invalid URLs
+            console.warn('Invalid URL:', newHref);
+        }
     };
packages/kg-default-nodes/test/nodes/call-to-action.test.js (1)

119-121: Add more test cases for href property.

Consider adding the following test cases:

  1. Test href validation with invalid URLs
  2. Test href rendering in DOM export
+        it('validates href URLs', editorTest(function () {
+            const callToActionNode = new CallToActionNode();
+            
+            // Valid URLs should be accepted
+            callToActionNode.href = 'https://example.com';
+            callToActionNode.href.should.equal('https://example.com');
+            
+            // Invalid URLs should be rejected or sanitized
+            callToActionNode.href = 'not-a-url';
+            callToActionNode.href.should.equal('');
+        }));
+
+        it('renders href in DOM export', editorTest(function () {
+            dataset.href = 'https://example.com';
+            const callToActionNode = new CallToActionNode(dataset);
+            const {element} = callToActionNode.exportDOM(exportOptions);
+            
+            const html = element.outerHTML.toString();
+            html.should.containEql('href="https://example.com"');
+        }));
packages/koenig-lexical/test/e2e/cards/cta-card.test.js (1)

444-452: LGTM! Consider adding more test cases for comprehensive coverage.

The test effectively verifies the presence and basic interaction of the Link button and input field in the CTA card toolbar.

Consider adding the following test cases to improve coverage:

  1. Verify that entering a URL in the link input updates the CTA card's href property.
  2. Verify that the link input preserves existing URLs when reopened.
  3. Verify URL validation (e.g., invalid URLs are handled appropriately).

Example test case:

test('can set and update CTA card link from toolbar', async function () {
    await focusEditor(page);
    await insertCard(page, {cardName: 'call-to-action'});
    await page.keyboard.press('Escape');
    
    // Set initial link
    await page.locator('[aria-label="Link"]').click();
    await page.getByTestId('link-input').fill('https://example.com');
    await page.keyboard.press('Enter');
    
    // Verify link was set
    await expect(page.locator('[data-kg-card="call-to-action"]'))
        .toHaveAttribute('href', 'https://example.com');
    
    // Verify link persists
    await page.locator('[aria-label="Link"]').click();
    await expect(page.getByTestId('link-input'))
        .toHaveValue('https://example.com');
});
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 1396afb and 3adcb87.

📒 Files selected for processing (5)
  • packages/kg-default-nodes/lib/nodes/call-to-action/CallToActionNode.js (1 hunks)
  • packages/kg-default-nodes/test/nodes/call-to-action.test.js (5 hunks)
  • packages/koenig-lexical/src/nodes/CallToActionNode.jsx (1 hunks)
  • packages/koenig-lexical/src/nodes/CallToActionNodeComponent.jsx (4 hunks)
  • packages/koenig-lexical/test/e2e/cards/cta-card.test.js (1 hunks)
🧰 Additional context used
📓 Learnings (2)
packages/koenig-lexical/src/nodes/CallToActionNode.jsx (1)
Learnt from: ronaldlangeveld
PR: TryGhost/Koenig#1437
File: packages/koenig-lexical/src/nodes/CallToActionNodeComponent.jsx:0-0
Timestamp: 2025-02-06T04:48:22.660Z
Learning: In the CallToActionNodeComponent of Koenig, only the main content editor (htmlEditor) should be set as editable in the useEffect hook. The sponsor label editor's (sponsorLabelHtmlEditor) editability is handled separately as it's an optional feature.
packages/koenig-lexical/src/nodes/CallToActionNodeComponent.jsx (1)
Learnt from: ronaldlangeveld
PR: TryGhost/Koenig#1437
File: packages/koenig-lexical/src/nodes/CallToActionNodeComponent.jsx:0-0
Timestamp: 2025-02-06T04:48:22.660Z
Learning: In the CallToActionNodeComponent of Koenig, only the main content editor (htmlEditor) should be set as editable in the useEffect hook. The sponsor label editor's (sponsorLabelHtmlEditor) editability is handled separately as it's an optional feature.
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: Node 20.11.1
🔇 Additional comments (2)
packages/kg-default-nodes/lib/nodes/call-to-action/CallToActionNode.js (1)

19-20: LGTM!

The href property is correctly defined with URL type validation, which is a good practice for link properties.

packages/koenig-lexical/src/nodes/CallToActionNode.jsx (1)

90-90: LGTM!

The href prop is correctly passed through to the CallToActionNodeComponent.

@ronaldlangeveld ronaldlangeveld changed the title Added link button to toolbar Added link button to CTA Card toolbar Feb 10, 2025
- Fixed a bug where the settings panel would open when using the toolbar
  features, like Link and Snippets.
Copy link

@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: 0

🧹 Nitpick comments (2)
packages/koenig-lexical/src/nodes/CallToActionNodeComponent.jsx (2)

36-36: Add input validation for href management.

While the link management functions are well-implemented, consider adding URL validation to prevent invalid links:

 const setHref = (newHref) => {
+    // Validate URL format
+    try {
+        if (newHref && !newHref.startsWith('#')) {
+            new URL(newHref);
+        }
         editor.update(() => {
             const node = $getNodeByKey(nodeKey);
             node.href = newHref;
         });
+    } catch (e) {
+        console.warn('Invalid URL format:', newHref);
+        return false;
+    }
+    return true;
 };

Also applies to: 121-139


187-199: Enhance accessibility for link management UI.

Consider adding accessibility improvements to the link management UI:

 <ActionToolbar
     data-kg-card-toolbar="link"
     isVisible={showLink}
+    aria-label="Link management toolbar"
 >
     <LinkInput
         cancel={cancelLinkAndReselect}
         href={href}
+        aria-label="URL input field"
         update={(_href) => {
             setHref(_href);
             cancelLinkAndReselect();
         }}
     />
 </ActionToolbar>

 <ToolbarMenuItem 
     icon="link" 
     isActive={href || false} 
     label="Link" 
+    title="Add link (Ctrl+K)"
+    shortcut="Ctrl+K"
     onClick = {() => {
         setShowLink(true);
     }} 
 />

Also applies to: 203-203, 208-210

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 9afc738 and e1e25cd.

📒 Files selected for processing (5)
  • packages/kg-default-nodes/lib/nodes/call-to-action/CallToActionNode.js (1 hunks)
  • packages/kg-default-nodes/test/nodes/call-to-action.test.js (5 hunks)
  • packages/koenig-lexical/src/nodes/CallToActionNode.jsx (1 hunks)
  • packages/koenig-lexical/src/nodes/CallToActionNodeComponent.jsx (4 hunks)
  • packages/koenig-lexical/test/e2e/cards/cta-card.test.js (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (4)
  • packages/kg-default-nodes/lib/nodes/call-to-action/CallToActionNode.js
  • packages/koenig-lexical/src/nodes/CallToActionNode.jsx
  • packages/koenig-lexical/test/e2e/cards/cta-card.test.js
  • packages/kg-default-nodes/test/nodes/call-to-action.test.js
🧰 Additional context used
🧠 Learnings (1)
packages/koenig-lexical/src/nodes/CallToActionNodeComponent.jsx (1)
Learnt from: ronaldlangeveld
PR: TryGhost/Koenig#1437
File: packages/koenig-lexical/src/nodes/CallToActionNodeComponent.jsx:0-0
Timestamp: 2025-02-06T04:48:22.660Z
Learning: In the CallToActionNodeComponent of Koenig, only the main content editor (htmlEditor) should be set as editable in the useEffect hook. The sponsor label editor's (sponsorLabelHtmlEditor) editability is handled separately as it's an optional feature.
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: Node 20.11.1
🔇 Additional comments (2)
packages/koenig-lexical/src/nodes/CallToActionNodeComponent.jsx (2)

4-4: LGTM! Well-structured imports and prop additions.

The new imports and href prop are correctly implemented to support the link functionality.

Also applies to: 7-7, 28-28


141-143: LGTM! Correctly follows established patterns.

The useEffect implementation correctly follows the established pattern of only setting the main content editor as editable.

@ronaldlangeveld ronaldlangeveld merged commit 4455a7d into main Feb 12, 2025
2 checks passed
@ronaldlangeveld ronaldlangeveld deleted the plg-329 branch February 12, 2025 04:35
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.

1 participant