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

#9196 Paywall banner in Sidebar and Page Editor #9271

Merged
merged 11 commits into from
Oct 15, 2024

Conversation

mnholtz
Copy link
Collaborator

@mnholtz mnholtz commented Oct 10, 2024

What does this PR do?

@twschiller twschiller added the enhancement New feature or request label Oct 10, 2024
Copy link

github-actions bot commented Oct 10, 2024

Playwright test results

passed  138 passed
flaky  2 flaky
skipped  2 skipped

Details

report  Open report ↗︎
stats  142 tests across 46 suites
duration  3 hours, 30 minutes, 29 seconds
commit  98d0e31
info  For more information on how to debug and view this report, see our readme

Flaky tests

msedge › tests/modLifecycle.spec.ts › create, run, package, and update mod
chrome › tests/pageEditor/copyMod.spec.ts › run a copied mod with a built-in integration

Skipped tests

chrome › tests/runtime/googleSheetsIntegration.spec.ts › can activate a google spreadsheet mod with config options
msedge › tests/runtime/googleSheetsIntegration.spec.ts › can activate a google spreadsheet mod with config options

@twschiller twschiller added this to the 2.1.5 milestone Oct 11, 2024
Copy link

codecov bot commented Oct 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 75.14%. Comparing base (8318d74) to head (98d0e31).
Report is 373 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #9271      +/-   ##
==========================================
+ Coverage   74.24%   75.14%   +0.89%     
==========================================
  Files        1332     1368      +36     
  Lines       40817    42225    +1408     
  Branches     7634     7867     +233     
==========================================
+ Hits        30306    31731    +1425     
+ Misses      10511    10494      -17     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@@ -27,7 +27,7 @@
<base target="_blank" />
</head>
<body class="h-100">
<div id="container" class="h-100 full-height">
<div id="container" class="h-100 full-height align-items-stretch">
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This along with the change to EditorLayout.scss fixes vertical scrolling issues when banners are present in the page editor

@@ -15,11 +15,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

import TrialCallToActionLink from "@/extensionConsole/pages/teamTrials/TrialCallToActionLink";
import useGetAllTeamScopes from "@/extensionConsole/pages/teamTrials/useGetAllTeamScopes";
import TrialCallToActionLink from "@/components/teamTrials/TrialCallToActionLink";
Copy link
Contributor

Choose a reason for hiding this comment

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

NIT: I know its outside the scope of your PR, but any reason that TrialAwareButton isn't the default export for the file?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

No idea; I don't see why not though

Copy link
Contributor

Choose a reason for hiding this comment

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

No idea; I don't see why not though

If you have a moment, please make it a default export. Otherwise, just go ahead and merge

@@ -18,6 +18,7 @@
.root {
display: flex;
height: inherit;
overflow: hidden;
Copy link
Contributor

@twschiller twschiller Oct 15, 2024

Choose a reason for hiding this comment

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

Add comment explaining why overflow is hidden vs. scrolling. E.g., cross referencing with comment https://github.com/pixiebrix/pixiebrix-extension/pull/9271/files#r1801656264

Copy link
Contributor

@twschiller twschiller left a comment

Choose a reason for hiding this comment

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

LGTM - before merging please comment in code explaining the wonkiness/decision on layout

Copy link

No loom links were found in the first post. Please add one there if you'd like to it to appear on Slack.

Do not edit this comment manually.

@mnholtz mnholtz enabled auto-merge (squash) October 15, 2024 18:58
@mnholtz mnholtz merged commit 1cfa77b into main Oct 15, 2024
23 checks passed
@mnholtz mnholtz deleted the feature/9196_paywall_in_sidebar_and_page_editor branch October 15, 2024 22:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Static trial expiration banner in Sidebar and Page Editor
2 participants