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

feat(PWA): Push Notifications (backport #1384) #1499

Merged
merged 29 commits into from
Mar 5, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 4, 2024

This is an automatic backport of pull request #1384 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit 054c25e)
(cherry picked from commit e6ddb51)
(cherry picked from commit a4d7c77)

# Conflicts:
#	frontend/package.json
…initialization

- use injectManifest to customize service worker

- use injectRegister to control when it gets registered (after fetching firebase config)

(cherry picked from commit df1214e)
(cherry picked from commit 59cd815)
…sw as classic instead of module

- module type is not very reliable and the sw often stops running

(cherry picked from commit 6fea7ce)

# Conflicts:
#	frontend/package.json
- move registration script to main.js

- replace hardcoded relay server URL with the one fetched from boot

(cherry picked from commit 892f338)
(cherry picked from commit d3b58a4)
(cherry picked from commit b4729c6)
(cherry picked from commit 7bcd414)

# Conflicts:
#	frontend/package.json
(cherry picked from commit 3c44635)
@mergify mergify bot requested a review from ruchamahabal as a code owner March 4, 2024 17:25
@mergify mergify bot added the conflicts label Mar 4, 2024
Copy link
Contributor Author

mergify bot commented Mar 4, 2024

Cherry-pick of a4d7c77 has failed:

On branch mergify/bp/version-15-hotfix/pr-1384
Your branch is ahead of 'origin/version-15-hotfix' by 5 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit a4d7c7749.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frontend/yarn.lock

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frontend/package.json

Cherry-pick of 6fea7ce has failed:

On branch mergify/bp/version-15-hotfix/pr-1384
Your branch is ahead of 'origin/version-15-hotfix' by 8 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 6fea7ce86.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frontend/index.html
	modified:   frontend/public/frappe-push-notification.js
	modified:   frontend/public/sw.js
	modified:   frontend/vite.config.js
	modified:   frontend/yarn.lock

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frontend/package.json

Cherry-pick of 7bcd414 has failed:

On branch mergify/bp/version-15-hotfix/pr-1384
Your branch is ahead of 'origin/version-15-hotfix' by 23 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 7bcd4140e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frontend/package.json

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 24.32432% with 28 lines in your changes are missing coverage. Please review.

Project coverage is 72.93%. Comparing base (fb41749) to head (64ecc65).
Report is 1 commits behind head on version-15-hotfix.

Additional details and impacted files
@@                  Coverage Diff                  @@
##           version-15-hotfix    #1499      +/-   ##
=====================================================
- Coverage              73.09%   72.93%   -0.17%     
=====================================================
  Files                    201      201              
  Lines                  11051    11087      +36     
=====================================================
+ Hits                    8078     8086       +8     
- Misses                  2973     3001      +28     
Files Coverage Δ
hrms/setup.py 21.37% <ø> (ø)
hrms/api/__init__.py 0.00% <0.00%> (ø)
...ms/hr/doctype/pwa_notification/pwa_notification.py 56.00% <45.00%> (-44.00%) ⬇️
hrms/www/hrms.py 0.00% <0.00%> (ø)

... and 1 file with indirect coverage changes

@ruchamahabal ruchamahabal merged commit 14dfa62 into version-15-hotfix Mar 5, 2024
8 checks passed
@mergify mergify bot deleted the mergify/bp/version-15-hotfix/pr-1384 branch March 5, 2024 03:40
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.13.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants