Skip to content

✨ [AMP Story Paywall] Handles grant status and show/hide paywall dialog in amp-story-subscriptions #37892

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.

Sign up for GitHub

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

Merged
ychsieh merged 127 commits into from
Mar 31, 2022
Merged

✨ [AMP Story Paywall] Handles grant status and show/hide paywall dialog in amp-story-subscriptions #37892

Changes from 1 commit
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
d977fd2
Create a new extension that would control paywall experience in amp-s…
ychsieh Jan 20, 2022
876ba53
Update extensions/amp-story-subscription/OWNERS
ychsieh Jan 21, 2022
115f58c
Merge branch 'main' into amp-story-subscription
ychsieh Jan 21, 2022
bfd09f1
Add validator required changes to pass the presubmit.
ychsieh Jan 21, 2022
76c5581
Update validation result
ychsieh Jan 24, 2022
98565ab
Replace htmlFor with JSX. Add I2I issue to the comment.
ychsieh Jan 24, 2022
5984f87
Add amp-story-subscription.html to allowlist. Will remove it once the…
ychsieh Jan 24, 2022
9c9fa3a
Fix lint errors
ychsieh Jan 24, 2022
e98ae97
Add a todo to remove allowlist once the validator rules are in.
ychsieh Jan 25, 2022
2ef0cb7
Rename amp-story-subscription to amp-story-subscriptions. Update owne…
ychsieh Jan 25, 2022
05e9d9f
Fix validator .out file.
ychsieh Jan 26, 2022
d26b5a8
Remove 'latest' verson as it's been deprecated.
ychsieh Jan 26, 2022
a1454f5
Merge branch 'main' into amp-story-subscription
ychsieh Jan 26, 2022
5e5147b
Add new states for displaying subscription dialog. Also add required …
ychsieh Jan 26, 2022
43fefcb
Delete trailing spaces.
ychsieh Jan 26, 2022
b5f639f
Add store service dependency.
ychsieh Jan 27, 2022
a0dde57
Apply Z_INDEX.md change.
ychsieh Jan 27, 2022
a1e5001
Marking attributes in new extension instead of in amp-story. Add func…
ychsieh Jan 28, 2022
5f13a0e
StoreService fixes. Also remove the AmpStoryPage attribute setting fu…
ychsieh Jan 28, 2022
000e1bb
Remove enums so that AmpStoryPage won't have dependency on new extens…
ychsieh Jan 31, 2022
a55639d
Call query selector on the document instead of the custom element, ot…
ychsieh Jan 31, 2022
02d3b0b
Add unit test case for paywall triggering upon receiving state update.
ychsieh Jan 31, 2022
3b6ca77
Fix lint error
ychsieh Jan 31, 2022
5b61b32
Merge branch 'main' of github.com:ampproject/amphtml into paywall-dialog
ychsieh Feb 1, 2022
6ce8848
Protect paywall logic behind an experiment. Some other minor fixes
ychsieh Feb 2, 2022
e9d3330
Optimize code
ychsieh Feb 2, 2022
055dc60
Unit test fix: wait for a tick to ensure the listeners registration …
ychsieh Feb 2, 2022
1112400
Merge branch 'main' of github.com:ampproject/amphtml into amp-story-s…
ychsieh Feb 2, 2022
eebfd4c
Merge branch 'amp-story-subscription' into paywall-dialog
ychsieh Feb 2, 2022
2ec8a35
Replace demo images with random images on splash to avoid the bundle …
ychsieh Feb 3, 2022
9464168
Minor fixes
ychsieh Feb 3, 2022
4d00152
Make 'subscriptions-section' a const for reuse.
ychsieh Feb 4, 2022
bfcf002
Update unit test with storeService stub instead of registering servic…
ychsieh Feb 4, 2022
5685b29
Linter fix
ychsieh Feb 4, 2022
509bcd0
Linter fix
ychsieh Feb 4, 2022
5926c18
Merge branch 'main' of github.com:ampproject/amphtml into paywall-dialog
ychsieh Feb 4, 2022
ad19867
Trigger AMP story paywall dialog. Adding callbacks to SubscriptionSer…
ychsieh Feb 8, 2022
1823fe6
Merge branch 'main' of github.com:ampproject/amphtml into paywall-dialog
ychsieh Feb 8, 2022
47b630d
Fix linter errors
ychsieh Feb 8, 2022
6d28823
Fix z-index
ychsieh Feb 8, 2022
df778c5
Merge branch 'main' into paywall-dialog
ychsieh Feb 9, 2022
2fa6e17
CSS fixes
ychsieh Feb 9, 2022
713e7c4
Unit test fix. Remove unnecessary switchTo call.
ychsieh Feb 9, 2022
8204105
Merge branch 'main' of github.com:ampproject/amphtml into amp-story-s…
ychsieh Feb 9, 2022
f8f038b
Update z_index markup
ychsieh Feb 11, 2022
241c5b2
Move dialog wrapper CSS style to amp-story-subscriptions
ychsieh Feb 11, 2022
b8b4b82
Fix CSS. Use JSX for UI. Use localized strings. Update comments.
ychsieh Feb 16, 2022
05ed864
Merge branch 'main' into paywall-dialog
ychsieh Feb 16, 2022
cc66ad1
Fix localized string bug
ychsieh Feb 16, 2022
a1b3219
Move all paywall triggering logic from amp-story to amp-story-subscri…
ychsieh Feb 16, 2022
3c3434e
Use publisher-logo-url from amp-story instead. Also added a test to v…
ychsieh Feb 16, 2022
dd7ecf0
Remove all subscriptions-section attribute logic. This is not needed …
ychsieh Feb 16, 2022
c19c5e4
Fix linter error
ychsieh Feb 16, 2022
a2600f1
Update comment
ychsieh Feb 16, 2022
ce5798f
Wait on entitlement response before showing paywall. Use an enum inst…
ychsieh Feb 17, 2022
9a3f021
Merge branch 'main' into paywall-dialog
ychsieh Feb 17, 2022
2765646
Fix dependency test
ychsieh Feb 17, 2022
22fc0fc
Merge branch 'paywall-dialog' of https://github.com/ychsieh/amphtml i…
ychsieh Feb 17, 2022
24620de
Separate the logic of switching subscription states and dialog ui state.
ychsieh Feb 18, 2022
887fbb2
Remove all changes and keep only the the amp-subscriptions ones to m…
ychsieh Feb 18, 2022
cc74589
Add the test to verify the callback added by the new API would still …
ychsieh Feb 18, 2022
d77886c
Merge branch 'main' into paywall-dialog
ychsieh Feb 18, 2022
33ebb4b
Add the usage of story-specific dialog wrapper class. Add unit test f…
ychsieh Feb 18, 2022
7609d47
Update based on missed comments
ychsieh Feb 18, 2022
210c014
update unit tests
ychsieh Feb 18, 2022
24a48f3
Really remove expect import...
ychsieh Feb 18, 2022
e6e3f49
nit
ychsieh Feb 18, 2022
829f700
Update unit test with exactly params
ychsieh Feb 23, 2022
67010e1
Fix import
ychsieh Feb 23, 2022
bf01050
nit
ychsieh Feb 23, 2022
c988a1b
Merge branch 'main' of github.com:ampproject/amphtml into paywall-dialog
ychsieh Feb 23, 2022
2ef17cd
Paywall-related story navigation
ychsieh Feb 24, 2022
6181b0c
Merge branch 'main' of github.com:ampproject/amphtml into amp-story-s…
ychsieh Feb 24, 2022
ca202bb
Merge branch 'amp-story' into amp-story-subscription
ychsieh Feb 24, 2022
459f7d8
Merge branch 'main' of github.com:ampproject/amphtml into amp-story-s…
ychsieh Feb 24, 2022
989fc68
Merge branch 'main' into paywall-dialog
ychsieh Feb 24, 2022
df5b117
Remove isPaywallProteced function. Move common logic in unit test to …
ychsieh Feb 24, 2022
1bb6e37
Remove unnecessary intitialize_ call
ychsieh Feb 25, 2022
fb197cd
Fix lint error
ychsieh Feb 25, 2022
7580cb9
Paywall-related story navigation
ychsieh Feb 24, 2022
911fd59
Remove isPaywallProteced function. Move common logic in unit test to …
ychsieh Feb 24, 2022
6b985a3
Fix lint error
ychsieh Feb 25, 2022
c7a4558
Merge branch 'amp-story' of https://github.com/ychsieh/amphtml into a…
ychsieh Mar 4, 2022
c2f91ad
Handle grant status and subscription states
ychsieh Feb 25, 2022
6d1d5b4
Remove unnecessary unit test imports
ychsieh Feb 25, 2022
0a1c504
Rename amp-subscription function to maybeRenderDialogForSelectedPlatform
ychsieh Mar 4, 2022
a09d9e9
Merge branch 'amp-story-subscription' of https://github.com/ychsieh/a…
ychsieh Mar 4, 2022
3a3f091
Update toggle action name to fix unit test
ychsieh Mar 4, 2022
a5837b5
Add end-to-end verification for platform activation to the unit test
ychsieh Mar 8, 2022
749257e
Merge branch 'main' of github.com:ampproject/amphtml into amp-story
ychsieh Mar 8, 2022
2a478c2
Merge branch 'paywall-dialog' into amp-story
ychsieh Mar 8, 2022
801a4a4
Fix unit test
ychsieh Mar 9, 2022
6347dd1
Remove pending state check since switchTo already has some guard agai…
ychsieh Mar 10, 2022
8a7c1ad
If starting deep in story, initialize with paywall page and navigate …
ychsieh Mar 15, 2022
ab08885
Merge branch 'main' into amp-story
ychsieh Mar 15, 2022
8550d12
Fix unit test by making RAF a sync op earlier than all click event di…
ychsieh Mar 15, 2022
270d8b7
Flatten if else nested blocks. Also add a test case for any switch ev…
ychsieh Mar 15, 2022
de65be0
Resume to the correct page even after tap previous. Click-based paywa…
ychsieh Mar 16, 2022
b12de29
lint
ychsieh Mar 17, 2022
2bec999
Update extensions/amp-story/1.0/amp-story.js
ychsieh Mar 17, 2022
2397335
Add a new navigation direction so that we don't need to maintain stat…
ychsieh Mar 17, 2022
4456a23
Simply handle pageAfterGranted_ differrently based on the target index.
ychsieh Mar 17, 2022
b666a69
Update comment.
ychsieh Mar 17, 2022
c263e00
Merge branch 'amp-story' into amp-story-subscriptions
ychsieh Mar 17, 2022
79b2206
Remove subscription state handler since it's beem handled in amp-story
ychsieh Mar 17, 2022
7cd90b1
lint
ychsieh Mar 17, 2022
69ff1aa
Flatten paywall if else blocks. Also add a new sub state to facilitat…
ychsieh Mar 18, 2022
9c6428c
Flatten the structure a bit by separating the logic of showing ui and…
ychsieh Mar 18, 2022
c3cb650
lint
ychsieh Mar 18, 2022
4f74de7
Merge branch 'main' into amp-story
ychsieh Mar 18, 2022
c8d72b8
Merge branch 'main' into amp-story
ychsieh Mar 21, 2022
8f2a438
Hide paywall dialog only for the paywall-enabled stories.
ychsieh Mar 21, 2022
a098930
Fix race condition issues in other unit tests by stubbing some async …
ychsieh Mar 21, 2022
d899c8a
Refactor to simplify logic and the readability. Big refactoring on th…
ychsieh Mar 22, 2022
849f897
Apply suggestions from code review
ychsieh Mar 22, 2022
6116262
last nits
ychsieh Mar 22, 2022
41acf76
Nits
ychsieh Mar 22, 2022
8994765
Merge branch 'amp-story' into amp-story-subscriptions
ychsieh Mar 22, 2022
05011f5
Merge branch 'main' into amp-story-subscription
ychsieh Mar 22, 2022
a312769
nit
ychsieh Mar 22, 2022
692be7a
Merge branch 'amp-story-subscription' of https://github.com/ychsieh/a…
ychsieh Mar 22, 2022
a72f88f
Nits
ychsieh Mar 22, 2022
c3064d6
nits and refactor
ychsieh Mar 23, 2022
bc329c2
refactor unit test
ychsieh Mar 24, 2022
ceb74a8
lint
ychsieh Mar 24, 2022
f762b21
Update unit test
ychsieh Mar 25, 2022
6e05ea1
Fix unit test
ychsieh Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into amp-story-subscription
  • Loading branch information
@ychsieh
ychsieh committed Jan 26, 2022
commit a1454f5d845e01d71c64656b5c7f618202152b51

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.