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

[NEW] Use setting to determine if initial general channel is needed #25441

Merged
merged 7 commits into from
May 12, 2022

Conversation

felipe-menelau
Copy link
Contributor

@felipe-menelau felipe-menelau commented May 9, 2022

Proposed changes (including videos or screenshots)

  • Adds flag responsible for overwriting #general channel creation

Issue(s)

On cloud-side the Saas trial flow is getting redone, and in the new flow many pieces of information once captured by the wizard are now being captured on the trial flow, for that reason saas instances will get injected on to them the flag that skips the setup-wizard with the consequence that #general channel is no longer gettin auto-created. The proposed fix is another flag that lets cloud override the previous behaviour and still auto-create the general channel for saas instances that skipped wizard.

Steps to test or reproduce

Further comments

@CLAassistant
Copy link

CLAassistant commented May 9, 2022

CLA assistant check
All committers have signed the CLA.

@casalsgh casalsgh added this to the 4.7.1 milestone May 10, 2022
@felipe-menelau felipe-menelau changed the title [NEW] adds FORCE_CREATE_GENERAL flag that ovewrites general channel creation [NEW] adds Force_Create_General_Channel hidden setting that ovewrites general channel creation May 11, 2022
Copy link
Contributor

@geekgonecrazy geekgonecrazy left a comment

Choose a reason for hiding this comment

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

Dropping a few comments here for a suggestion to alter it.

Making the setting true by default. Then no matter what on Rocket.Chat wizard or no wizard it will create this channel if the value is true. Then once created its set to false keeping it from being created by true.

The problem with the other flow is if this value stays true by injecting (like we'd have to do on SaaS) it'll keep trying to create that channel over and over. But we actually just want it to create regardless of the wizard. This prevents us from needing to pass this value in.

Added benefit.. if anyone loses their General channel they can set this back to true and it'll re-create it :)

apps/meteor/app/lib/server/startup/settings.ts Outdated Show resolved Hide resolved
apps/meteor/server/startup/initialData.js Outdated Show resolved Hide resolved
apps/meteor/server/startup/initialData.js Outdated Show resolved Hide resolved
apps/meteor/server/startup/initialData.js Outdated Show resolved Hide resolved
@sampaiodiego
Copy link
Member

I was doing some changes while you're adding comments @geekgonecrazy 😬 pls take another look =)

@geekgonecrazy
Copy link
Contributor

@sampaiodiego I think you must have been looking inside of my mind. Thats exactly what I was suggesting 😂

@geekgonecrazy geekgonecrazy changed the title [NEW] adds Force_Create_General_Channel hidden setting that ovewrites general channel creation [NEW] Use setting to determine if initial general channel is needed May 11, 2022
@pierre-lehnen-rc pierre-lehnen-rc merged commit b708948 into develop May 12, 2022
@pierre-lehnen-rc pierre-lehnen-rc deleted the force-create-general-flag branch May 12, 2022 15:13
gabriellsh added a commit that referenced this pull request May 12, 2022
…lists

* 'develop' of github.com:RocketChat/Rocket.Chat:
  Chore: Move markdown message parser to a `callback` (#25413)
  [FIX] Settings listeners not receiving overwritten values from env vars (#25448)
  Chore: Move ddp-streamer micro service to its own sub-repo (#25246)
  [NEW] Use setting to determine if initial general channel is needed (#25441)
  [IMPROVE] New admin settings Page (#25439)
  [FIX] Failure to update Integration History index (#25473)
  Chore: Rewrite 2fa to typescript (#25285)
  Chore: solve yarn issues from env var (#25468)
  Chore: REST query and body params validation (#25446)
  Chore: Tests with Playwright (task: ROC-66, Intermittent resolution in tests) (#25416)
  Chore: Convert email inbox feature to TypeScript (#25298)
d-gubert pushed a commit that referenced this pull request May 13, 2022
…25441)

* feat: adds FORCE_CREATE_GENERAL flag that creates general channel even when setup wizard is not pending

* fix: moves FORCE_CREATE_GENERAL to hidden setting

* Change flow

* Remove import

* Fix findOne

* Migration to avoid general re-creation

Co-authored-by: Diego Sampaio <chinello@gmail.com>
@d-gubert d-gubert mentioned this pull request May 13, 2022
gabriellsh added a commit that referenced this pull request May 16, 2022
* 'develop' of github.com:RocketChat/Rocket.Chat:
  Chore: Migrate NotFoundPage to TS (#25509)
  [FIX] Unable to see channel member list by authorized channel roles (#25412)
  Regression: Fix services-image-build-check (#25519)
  Chore: Migrate spotify to ts (#25507)
  [Chore] Reorder unreleased migrations (#25508)
  [FIX] Spotlight results showing usernames instead of real names (#25471)
  [FIX] LDAP sync removing users from channels when multiple groups are mapped to it (#25434)
  Chore: Move markdown message parser to a `callback` (#25413)
  [FIX] Settings listeners not receiving overwritten values from env vars (#25448)
  Chore: Move ddp-streamer micro service to its own sub-repo (#25246)
  [NEW] Use setting to determine if initial general channel is needed (#25441)
  [IMPROVE] New admin settings Page (#25439)
  [FIX] Failure to update Integration History index (#25473)
  Chore: Rewrite 2fa to typescript (#25285)
  Chore: solve yarn issues from env var (#25468)
  Chore: REST query and body params validation (#25446)
  Chore: Tests with Playwright (task: ROC-66, Intermittent resolution in tests) (#25416)
  Chore: Convert email inbox feature to TypeScript (#25298)
gabriellsh added a commit that referenced this pull request May 17, 2022
…threadTemplate

* 'develop' of github.com:RocketChat/Rocket.Chat: (29 commits)
  Chore: migrate from cypress to pw 14-setting-permission (#25523)
  Chore: Tests with Playwright (task: ROC-31, 12-settings) (#25253)
  Chore: Migrate 15-message-popup from cypress to playwright (#25462)
  Chore: Convert apps/meteor/client/views/admin/settings/inputs folder (#25427)
  [FIX] UI/UX issues on Live Chat widget (#25407)
  Chore: Convert Admin -> Rooms to TS (#25348)
  Chore: Migrate NotFoundPage to TS (#25509)
  [FIX] Unable to see channel member list by authorized channel roles (#25412)
  Regression: Fix services-image-build-check (#25519)
  Chore: Migrate spotify to ts (#25507)
  [Chore] Reorder unreleased migrations (#25508)
  [FIX] Spotlight results showing usernames instead of real names (#25471)
  [FIX] LDAP sync removing users from channels when multiple groups are mapped to it (#25434)
  Chore: Move markdown message parser to a `callback` (#25413)
  [FIX] Settings listeners not receiving overwritten values from env vars (#25448)
  Chore: Move ddp-streamer micro service to its own sub-repo (#25246)
  [NEW] Use setting to determine if initial general channel is needed (#25441)
  [IMPROVE] New admin settings Page (#25439)
  [FIX] Failure to update Integration History index (#25473)
  Chore: Rewrite 2fa to typescript (#25285)
  ...
@murtaza98 murtaza98 mentioned this pull request Jul 21, 2022
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.

None yet

6 participants