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

fix(profile-settings): notifications settings dropping after profile update #396

Merged
merged 2 commits into from
Feb 21, 2022

Conversation

neSpecc
Copy link
Member

@neSpecc neSpecc commented Feb 18, 2022

Currently, after profile update, all the notifications settings will be overridden by { email : 'user email' }

This PR fixes that

image

Resolves #395

@neSpecc neSpecc merged commit 18f32e6 into master Feb 21, 2022
@neSpecc neSpecc deleted the fix/395-drop-notifies-settings branch February 21, 2022 16:24
GeekaN2 added a commit that referenced this pull request Feb 22, 2022
* Create pr-to-prod.yml (#346)

* remove deploy rule (#349)

* remove deploy rule

* Update build-and-push-docker-image.yml

* Update build-and-push-docker-image.yml

* unblock wksp on plan changing (#352)

* Email notifications with priority (#339)

* Email notifications with priority

* Fix linter errors

* Remove sign-up email from templates

* Renamed default priority

* Added password-reset and workspace-invite emails (#356)

* improvement(repetitions): title and type added to Repetition payload (#358)

* [Feature] New integration token format (#357)

* upgrade hawk.types

* create project with new integration token format

* add resolver for regenerating token

* refactor generating token

* fix import

* refactor type of returned object

* Update projectsFactory.ts

* Update project.ts

* refactor generating integration id

* Update projectsFactory.ts

* generate integration id if not any (#360)

* Fix catcher problems

* Event repetitions pagination (#363)

* feat: Event repetitions load

* Fix lint

* Fix lint

* Add seed resolver for e2e env (#366)

* Add seed resolver for e2e env

* Add workspace model back

* Fix lint

* [Feature] Date from objectid (#370)

* add function for getting timestamp from object id

* return date from function, add resolver for project

* add resolvers for user and workspace to

* add test

* Send commits on build (#367)

* send commits on build

* add name to release id

* Bump version up to 1.0.1

* remove commits.sh

* update workflow

* Update build-and-push-docker-image.yml

* Update package.json

* test

* remove log

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Bump tmpl from 1.0.4 to 1.0.5 (#374)

Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/daaku/nodejs-tmpl/releases)
- [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5)

---
updated-dependencies:
- dependency-name: tmpl
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump object-path from 0.11.5 to 0.11.8 (#373)

Bumps [object-path](https://github.com/mariocasciaro/object-path) from 0.11.5 to 0.11.8.
- [Release notes](https://github.com/mariocasciaro/object-path/releases)
- [Commits](https://github.com/mariocasciaro/object-path/commits)

---
updated-dependencies:
- dependency-name: object-path
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Taly <vitalik7tv@yandex.ru>

* Bump axios from 0.21.1 to 0.21.2 (#372)

* Bump axios from 0.21.1 to 0.21.2

Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](axios/axios@v0.21.1...v0.21.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump version up to 1.0.4

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Taly <vitalik7tv@yandex.ru>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Bump passport-oauth2 from 1.5.0 to 1.6.1 (#375)

Bumps [passport-oauth2](https://github.com/jaredhanson/passport-oauth2) from 1.5.0 to 1.6.1.
- [Release notes](https://github.com/jaredhanson/passport-oauth2/releases)
- [Changelog](https://github.com/jaredhanson/passport-oauth2/blob/master/CHANGELOG.md)
- [Commits](jaredhanson/passport-oauth2@v1.5.0...v1.6.1)

---
updated-dependencies:
- dependency-name: passport-oauth2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix workspace editing (#376)

* fix Validator importing

* remove JWT_SECRET_PROJECT_TOKEN from .env.sample

* Bump version up to 1.0.5

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Update user.ts

* Feature: hidden plans (#377)

* rename methods

* Update workspaceMutations.ts

* rename vars

* do not show hidden plans

* Bump version up to 1.0.6

* hawk.types -> @hawk.so/types

* update types

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* fix: do not add user to wksp without prompt (#381)

* Fix logic and add comments

* Bump version up to 1.0.7

* do not show invite pending wksp in the list

* rename method

addUnregisteredMember -> addMemberByEmail

* Update workspace.js

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* CORS added (#385)

* CORS added

* Bump version up to 1.0.8

* cors restricted

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* branch fixed (#389)

* `changeplan` updated with tariffPlanId (#390)

* change plan updated with tariffPlanId

* Bump version up to 1.0.8

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Bump nodemailer from 6.4.18 to 6.6.1 (#388)

Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.4.18 to 6.6.1.
- [Release notes](https://github.com/nodemailer/nodemailer/releases)
- [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md)
- [Commits](nodemailer/nodemailer@v6.4.18...v6.6.1)

---
updated-dependencies:
- dependency-name: nodemailer
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump follow-redirects from 1.14.4 to 1.14.7 (#386)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.4 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.14.4...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Peter Savchenko <specc.dev@gmail.com>

* Fix Join workspace using invitation link (#382)

* update the workspace method for confirmationlink

* update the confirmmembership function of workspace

* comments added

* lints removed

* Bump version up to 1.0.7

* Bump version up to 1.0.8

* Bump version up to 1.0.9

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Bump follow-redirects from 1.14.7 to 1.14.8 (#392)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix(profile-settings): notifications settings dropping after profile update (#396)

* fix(profile-settings): notifications settings dropping after profile update

* Bump version up to 1.0.10

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Crutch for demo workspace team (#398)

* Update workspace.js

* Bump version up to 1.0.11

* Update workspace.js

* hide visited by

* Update event.js

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

Co-authored-by: Taly <vitalik7tv@yandex.ru>
Co-authored-by: Mikhail Popov <geekan@bk.ru>
Co-authored-by: Peter Savchenko <specc.dev@gmail.com>
Co-authored-by: Ilya Moroz <37909603+ilyamore88@users.noreply.github.com>
Co-authored-by: Nikita Melnikov <nikmel2803@gmail.com>
Co-authored-by: Georgy Berezhnoy <gohabereg@gmail.com>
Co-authored-by: George Berezhnoy <gohabereg@users.noreply.github.com>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Umang G. Patel <23169768+robonetphy@users.noreply.github.com>
GeekaN2 added a commit that referenced this pull request Feb 22, 2022
* Create pr-to-prod.yml (#346)

* remove deploy rule (#349)

* remove deploy rule

* Update build-and-push-docker-image.yml

* Update build-and-push-docker-image.yml

* unblock wksp on plan changing (#352)

* Email notifications with priority (#339)

* Email notifications with priority

* Fix linter errors

* Remove sign-up email from templates

* Renamed default priority

* Added password-reset and workspace-invite emails (#356)

* improvement(repetitions): title and type added to Repetition payload (#358)

* [Feature] New integration token format (#357)

* upgrade hawk.types

* create project with new integration token format

* add resolver for regenerating token

* refactor generating token

* fix import

* refactor type of returned object

* Update projectsFactory.ts

* Update project.ts

* refactor generating integration id

* Update projectsFactory.ts

* generate integration id if not any (#360)

* Fix catcher problems

* Event repetitions pagination (#363)

* feat: Event repetitions load

* Fix lint

* Fix lint

* Add seed resolver for e2e env (#366)

* Add seed resolver for e2e env

* Add workspace model back

* Fix lint

* [Feature] Date from objectid (#370)

* add function for getting timestamp from object id

* return date from function, add resolver for project

* add resolvers for user and workspace to

* add test

* Send commits on build (#367)

* send commits on build

* add name to release id

* Bump version up to 1.0.1

* remove commits.sh

* update workflow

* Update build-and-push-docker-image.yml

* Update package.json

* test

* remove log

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Bump tmpl from 1.0.4 to 1.0.5 (#374)

Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/daaku/nodejs-tmpl/releases)
- [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5)

---
updated-dependencies:
- dependency-name: tmpl
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump object-path from 0.11.5 to 0.11.8 (#373)

Bumps [object-path](https://github.com/mariocasciaro/object-path) from 0.11.5 to 0.11.8.
- [Release notes](https://github.com/mariocasciaro/object-path/releases)
- [Commits](https://github.com/mariocasciaro/object-path/commits)

---
updated-dependencies:
- dependency-name: object-path
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Taly <vitalik7tv@yandex.ru>

* Bump axios from 0.21.1 to 0.21.2 (#372)

* Bump axios from 0.21.1 to 0.21.2

Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](axios/axios@v0.21.1...v0.21.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump version up to 1.0.4

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Taly <vitalik7tv@yandex.ru>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Bump passport-oauth2 from 1.5.0 to 1.6.1 (#375)

Bumps [passport-oauth2](https://github.com/jaredhanson/passport-oauth2) from 1.5.0 to 1.6.1.
- [Release notes](https://github.com/jaredhanson/passport-oauth2/releases)
- [Changelog](https://github.com/jaredhanson/passport-oauth2/blob/master/CHANGELOG.md)
- [Commits](jaredhanson/passport-oauth2@v1.5.0...v1.6.1)

---
updated-dependencies:
- dependency-name: passport-oauth2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix workspace editing (#376)

* fix Validator importing

* remove JWT_SECRET_PROJECT_TOKEN from .env.sample

* Bump version up to 1.0.5

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Update user.ts

* Feature: hidden plans (#377)

* rename methods

* Update workspaceMutations.ts

* rename vars

* do not show hidden plans

* Bump version up to 1.0.6

* hawk.types -> @hawk.so/types

* update types

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* fix: do not add user to wksp without prompt (#381)

* Fix logic and add comments

* Bump version up to 1.0.7

* do not show invite pending wksp in the list

* rename method

addUnregisteredMember -> addMemberByEmail

* Update workspace.js

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* CORS added (#385)

* CORS added

* Bump version up to 1.0.8

* cors restricted

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* branch fixed (#389)

* `changeplan` updated with tariffPlanId (#390)

* change plan updated with tariffPlanId

* Bump version up to 1.0.8

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Bump nodemailer from 6.4.18 to 6.6.1 (#388)

Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.4.18 to 6.6.1.
- [Release notes](https://github.com/nodemailer/nodemailer/releases)
- [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md)
- [Commits](nodemailer/nodemailer@v6.4.18...v6.6.1)

---
updated-dependencies:
- dependency-name: nodemailer
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump follow-redirects from 1.14.4 to 1.14.7 (#386)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.4 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.14.4...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Peter Savchenko <specc.dev@gmail.com>

* Fix Join workspace using invitation link (#382)

* update the workspace method for confirmationlink

* update the confirmmembership function of workspace

* comments added

* lints removed

* Bump version up to 1.0.7

* Bump version up to 1.0.8

* Bump version up to 1.0.9

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Bump follow-redirects from 1.14.7 to 1.14.8 (#392)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix(profile-settings): notifications settings dropping after profile update (#396)

* fix(profile-settings): notifications settings dropping after profile update

* Bump version up to 1.0.10

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Crutch for demo workspace team (#398)

* Update workspace.js

* Bump version up to 1.0.11

* Update workspace.js

* hide visited by

* Update event.js

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* User events (#399)

* User events

* Bump version up to 1.0.12

* Added team join event log

* Fix eslint errors

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* fix eslint error

Co-authored-by: Taly <vitalik7tv@yandex.ru>
Co-authored-by: Mikhail Popov <geekan@bk.ru>
Co-authored-by: Peter Savchenko <specc.dev@gmail.com>
Co-authored-by: Ilya Moroz <37909603+ilyamore88@users.noreply.github.com>
Co-authored-by: Nikita Melnikov <nikmel2803@gmail.com>
Co-authored-by: Georgy Berezhnoy <gohabereg@gmail.com>
Co-authored-by: George Berezhnoy <gohabereg@users.noreply.github.com>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Umang G. Patel <23169768+robonetphy@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

User Notifications Settings breaks after profile update
2 participants