Skip to content

add the disconnect modal#22004

Merged
pls78 merged 7 commits intotrunkfrom
419-add-the-disconnect-are-you-sure-modal-to-the-integration-card
Feb 5, 2025
Merged

add the disconnect modal#22004
pls78 merged 7 commits intotrunkfrom
419-add-the-disconnect-are-you-sure-modal-to-the-integration-card

Conversation

@vraja-pro
Copy link
Copy Markdown
Contributor

@vraja-pro vraja-pro commented Jan 30, 2025

Context

  • We want to add the UI for disconnection the consent modal for google site kit.

Summary

This PR can be summarized in the following changelog entry:

  • Add a disconnect modal to the google site kit integration card when disconnecting from site kit.

Relevant technical choices:

Test instructions

Test instructions for the acceptance test before the PR gets merged

This PR can be acceptance tested by following these steps:

The disconnect functionality will come in a future PR, the test instructions are only for the modal ui and dismissing it.

  • Install, activate site kit

  • Apply the following patch to the the modal:
    disconnect-new.patch

  • Click on disconnect.

  • Check you see a modal.

  • Check the modal is the same as the design:

Screenshot 2025-02-05 at 14 05 18
  • Click on "No, stay connected"
  • Check the modal is dismissed.

Relevant test scenarios

  • Changes should be tested with the browser console open
  • Changes should be tested on different posts/pages/taxonomies/custom post types/custom taxonomies
  • Changes should be tested on different editors (Default Block/Gutenberg/Classic/Elementor/other)
  • Changes should be tested on different browsers
  • Changes should be tested on multisite

Test instructions for QA when the code is in the RC

  • QA should use the same steps as above.

QA can test this PR by following these steps:

Impact check

This PR affects the following parts of the plugin, which may require extra testing:

UI changes

  • This PR changes the UI in the plugin. I have added the 'UI change' label to this PR.

Other environments

  • This PR also affects Shopify. I have added a changelog entry starting with [shopify-seo], added test instructions for Shopify and attached the Shopify label to this PR.

Documentation

  • I have written documentation for this change. For example, comments in the Relevant technical choices, comments in the code, documentation on Confluence / shared Google Drive / Yoast developer portal, or other.

Quality assurance

  • I have tested this code to the best of my abilities.
  • During testing, I had activated all plugins that Yoast SEO provides integrations for.
  • I have added unit tests to verify the code works as intended.
  • If any part of the code is behind a feature flag, my test instructions also cover cases where the feature flag is switched off.
  • I have written this PR in accordance with my team's definition of done.
  • I have checked that the base branch is correctly set.

Innovation

  • No innovation project is applicable for this PR.
  • This PR falls under an innovation project. I have attached the innovation label.
  • I have added my hours to the WBSO document.

Fixes #Add the disconnect are you sure modal to the integration card

@vraja-pro vraja-pro added the changelog: non-user-facing Needs to be included in the 'Non-userfacing' category in the changelog label Jan 30, 2025
@coveralls
Copy link
Copy Markdown

coveralls commented Jan 30, 2025

Pull Request Test Coverage Report for Build 45fadbec8095ebf138aaeeb29d158dc8cdb4ad9f

Details

  • 3 of 4 (75.0%) changed or added relevant lines in 2 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 54.495%

Changes Missing Coverage Covered Lines Changed/Added Lines %
packages/js/src/integrations-page/recommended-integrations.js 0 1 0.0%
Totals Coverage Status
Change from base Build 6432da1eeec3e2c672bc1d771d33639d647ecde2: 0.0%
Covered Lines: 30195
Relevant Lines: 55837

💛 - Coveralls

@github-actions
Copy link
Copy Markdown

A merge conflict has been detected for the proposed code changes in this PR. Please resolve the conflict by either rebasing the PR or merging in changes from the base branch.

@vraja-pro vraja-pro force-pushed the 419-add-the-disconnect-are-you-sure-modal-to-the-integration-card branch from ac41c66 to 59704d5 Compare February 5, 2025 10:34
@pls78 pls78 added this to the 24.6 milestone Feb 5, 2025
import { ReactComponent as SiteKitLogo } from "../../images/site-kit-logo.svg";
import { Button, useToggleState } from "@yoast/ui-library";
import { SiteKitConsentModal } from "../shared-admin/components";
import { SiteKitConsentModal, UnsavedChangesModal as DisconnectModal } from "../shared-admin/components";
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Outside of the scope of this issue, but perhaps it would be better to rename UnsavedChangesModal to something like ActionConfirmationModal. It seems to me this is the way we are going to use this component

@pls78 pls78 merged commit 0e3afd5 into trunk Feb 5, 2025
@pls78 pls78 deleted the 419-add-the-disconnect-are-you-sure-modal-to-the-integration-card branch February 5, 2025 13:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog: non-user-facing Needs to be included in the 'Non-userfacing' category in the changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants