#9196 Paywall banner in Sidebar and Page Editor #9271

mnholtz · 2024-10-10T23:37:03Z

What does this PR do?

Closes Static trial expiration banner in Sidebar and Page Editor #9196
Moves the teamTrials/ directory to src/components
There is some known wonkiness with vertical scrolling in the sidebar when the expiration banner is present. Does not affect mod usability (just visual). Per discussion with @Pashaminkovsky (see here for discussion and loom demo) we are ok with rolling with this issue for now

github-actions · 2024-10-10T23:53:16Z

Playwright test results

138 passed
2 flaky
2 skipped

Details

Open report ↗︎
142 tests across 46 suites
3 hours, 30 minutes, 29 seconds
98d0e31
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

codecov · 2024-10-11T23:06:00Z

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.

src/bricks/renderers/document.tsx

mnholtz · 2024-10-11T23:33:29Z

src/pageEditor/pageEditor.html

@@ -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">


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

twschiller · 2024-10-15T17:44:01Z

src/components/teamTrials/TrialAwareButton.tsx

@@ -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";


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

No idea; I don't see why not though

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

twschiller · 2024-10-15T17:44:35Z

src/pageEditor/layout/EditorLayout.module.scss

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


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

twschiller

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

github-actions · 2024-10-15T17:46:10Z

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.

…ps://github.com/pixiebrix/pixiebrix-extension into feature/9196_paywall_in_sidebar_and_page_editor merge origin

mnholtz added 3 commits October 10, 2024 16:04

refactor move teamTrials directory to src/components

1cc7152

add trial status to Sidebar and Page Editor if expired

0cfcb2f

fix hook location in SidebarBody

9f75d02

mnholtz requested review from twschiller and fungairino October 10, 2024 23:37

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

twschiller assigned mnholtz Oct 10, 2024

twschiller added this to the 2.1.5 milestone Oct 11, 2024

add flex display to containing divs

6e9dbb3

vercel bot deployed to Preview October 11, 2024 19:11 View deployment

remove isolatedComponent style

2ed2ffd

vercel bot deployed to Preview October 11, 2024 19:20 View deployment

mnholtz added 2 commits October 11, 2024 15:49

fix page editor vertical scrolling

5db6b22

fix SidebarBody tests

e32bbb9

vercel bot deployed to Preview October 11, 2024 22:59 View deployment

mnholtz commented Oct 11, 2024

View reviewed changes

src/bricks/renderers/document.tsx Outdated Show resolved Hide resolved

mnholtz commented Oct 11, 2024

View reviewed changes

revert display: flex in document.tsx

30324dc

vercel bot deployed to Preview October 15, 2024 16:42 View deployment

mnholtz marked this pull request as ready for review October 15, 2024 17:33

Merge branch 'main' into feature/9196_paywall_in_sidebar_and_page_editor

b568ac9

vercel bot deployed to Preview October 15, 2024 17:34 View deployment

twschiller reviewed Oct 15, 2024

View reviewed changes

twschiller approved these changes Oct 15, 2024

View reviewed changes

mnholtz added 2 commits October 15, 2024 11:54

add comment and change overflow: hidden -> auto

92adfcc

Merge branch 'feature/9196_paywall_in_sidebar_and_page_editor' of htt…

98d0e31

…ps://github.com/pixiebrix/pixiebrix-extension into feature/9196_paywall_in_sidebar_and_page_editor merge origin

mnholtz enabled auto-merge (squash) October 15, 2024 18:58

vercel bot deployed to Preview October 15, 2024 18:59 View deployment

mnholtz merged commit 1cfa77b into main Oct 15, 2024
23 checks passed

mnholtz deleted the feature/9196_paywall_in_sidebar_and_page_editor branch October 15, 2024 22:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#9196 Paywall banner in Sidebar and Page Editor #9271

#9196 Paywall banner in Sidebar and Page Editor #9271

mnholtz commented Oct 10, 2024 •

edited

Loading

github-actions bot commented Oct 10, 2024 •

edited

Loading

codecov bot commented Oct 11, 2024 •

edited

Loading

mnholtz Oct 11, 2024

twschiller Oct 15, 2024

mnholtz Oct 15, 2024

twschiller Oct 15, 2024

twschiller Oct 15, 2024 •

edited

Loading

twschiller left a comment

github-actions bot commented Oct 15, 2024

#9196 Paywall banner in Sidebar and Page Editor #9271

#9196 Paywall banner in Sidebar and Page Editor #9271

Conversation

mnholtz commented Oct 10, 2024 • edited Loading

What does this PR do?

github-actions bot commented Oct 10, 2024 • edited Loading

Playwright test results

Details

codecov bot commented Oct 11, 2024 • edited Loading

Codecov Report

mnholtz Oct 11, 2024

Choose a reason for hiding this comment

twschiller Oct 15, 2024

Choose a reason for hiding this comment

mnholtz Oct 15, 2024

Choose a reason for hiding this comment

twschiller Oct 15, 2024

Choose a reason for hiding this comment

twschiller Oct 15, 2024 • edited Loading

Choose a reason for hiding this comment

twschiller left a comment

Choose a reason for hiding this comment

github-actions bot commented Oct 15, 2024

mnholtz commented Oct 10, 2024 •

edited

Loading

github-actions bot commented Oct 10, 2024 •

edited

Loading

codecov bot commented Oct 11, 2024 •

edited

Loading

twschiller Oct 15, 2024 •

edited

Loading