Skip to content

Chore: Add deprecation warning to settings #27295

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
kodiakhq merged 4 commits into from
Nov 19, 2022
Merged

Chore: Add deprecation warning to settings #27295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f4bc0b
Add warning to all needed settings
gabriellsh Nov 18, 2022
e3fcc06
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into depr…
gabriellsh Nov 18, 2022
630a742
Add dot
gabriellsh Nov 18, 2022
f5a46b4
Merge branch 'develop' into deprecateSettings
kodiakhq[bot] Nov 18, 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
8 changes: 8 additions & 0 deletions apps/meteor/app/autolinker/server/settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Meteor.startup(function () {
section: 'AutoLinker',
public: true,
i18nLabel: 'Enabled',
alert: 'This_is_a_deprecated_feature_alert',
});

settingsRegistry.add('AutoLinker_StripPrefix', false, {
Expand All @@ -23,41 +24,47 @@ Meteor.startup(function () {
public: true,
i18nDescription: 'AutoLinker_StripPrefix_Description',
enableQuery,
alert: 'This_is_a_deprecated_feature_alert',
});
settingsRegistry.add('AutoLinker_Urls_Scheme', true, {
type: 'boolean',
group: 'Message',
section: 'AutoLinker',
public: true,
enableQuery,
alert: 'This_is_a_deprecated_feature_alert',
});
settingsRegistry.add('AutoLinker_Urls_www', true, {
type: 'boolean',
group: 'Message',
section: 'AutoLinker',
public: true,
enableQuery,
alert: 'This_is_a_deprecated_feature_alert',
});
settingsRegistry.add('AutoLinker_Urls_TLD', true, {
type: 'boolean',
group: 'Message',
section: 'AutoLinker',
public: true,
enableQuery,
alert: 'This_is_a_deprecated_feature_alert',
});
settingsRegistry.add('AutoLinker_UrlsRegExp', '(://|www\\.).+', {
type: 'string',
group: 'Message',
section: 'AutoLinker',
public: true,
enableQuery,
alert: 'This_is_a_deprecated_feature_alert',
});
settingsRegistry.add('AutoLinker_Email', true, {
type: 'boolean',
group: 'Message',
section: 'AutoLinker',
public: true,
enableQuery,
alert: 'This_is_a_deprecated_feature_alert',
});
settingsRegistry.add('AutoLinker_Phone', true, {
type: 'boolean',
Expand All @@ -66,5 +73,6 @@ Meteor.startup(function () {
public: true,
i18nDescription: 'AutoLinker_Phone_Description',
enableQuery,
alert: 'This_is_a_deprecated_feature_alert',
});
});
2 changes: 1 addition & 1 deletion apps/meteor/app/federation/server/startup/settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ settingsRegistry.addGroup('Federation', function () {
type: 'boolean',
i18nLabel: 'Enabled',
i18nDescription: 'FEDERATION_Enabled',
alert: 'FEDERATION_Enabled_Alert',
alert: 'This_is_a_deprecated_feature_alert',
public: true,
});

Expand Down
2 changes: 2 additions & 0 deletions apps/meteor/app/issuelinks/server/settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ settingsRegistry.add('IssueLinks_Enabled', false, {
group: 'Message',
section: 'Issue_Links',
public: true,
alert: 'This_is_a_deprecated_feature_alert',
});

settingsRegistry.add('IssueLinks_Template', '', {
Expand All @@ -16,4 +17,5 @@ settingsRegistry.add('IssueLinks_Template', '', {
group: 'Message',
section: 'Issue_Links',
public: true,
alert: 'This_is_a_deprecated_feature_alert',
});
6 changes: 5 additions & 1 deletion apps/meteor/app/lib/server/startup/settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ settingsRegistry.addGroup('Accounts', function () {
type: 'boolean',
public: true,
i18nLabel: 'Use_Legacy_Message_Template',
alert: 'Use_Legacy_Message_Template_alert',
alert: 'This_is_a_deprecated_feature_alert',
});
});

Expand Down Expand Up @@ -1144,6 +1144,7 @@ settingsRegistry.addGroup('Message', function () {
type: 'boolean',
public: true,
i18nDescription: 'Message_Attachments_GroupAttachDescription',
alert: 'This_is_a_deprecated_feature_alert',
});

this.add('Message_Attachments_Thumbnails_Enabled', true, {
Expand Down Expand Up @@ -1223,6 +1224,7 @@ settingsRegistry.addGroup('Message', function () {
this.add('Message_ShowEditedStatus', true, {
type: 'boolean',
public: true,
alert: 'This_is_a_deprecated_feature_alert',
});
this.add('Message_ShowDeletedStatus', false, {
type: 'boolean',
Expand Down Expand Up @@ -1259,6 +1261,7 @@ settingsRegistry.addGroup('Message', function () {
this.add('Message_ShowFormattingTips', true, {
type: 'boolean',
public: true,
alert: 'This_is_a_deprecated_feature_alert',
});
this.add('Message_GroupingPeriod', 300, {
type: 'int',
Expand Down Expand Up @@ -1291,6 +1294,7 @@ settingsRegistry.addGroup('Message', function () {
type: 'string',
public: true,
i18nDescription: 'API_EmbedDisabledFor_Description',
alert: 'This_is_a_deprecated_feature_alert',
});
// TODO: deprecate this setting in favor of App
this.add('API_EmbedIgnoredHosts', 'localhost, 127.0.0.1, 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16', {
Expand Down
10 changes: 9 additions & 1 deletion apps/meteor/app/markdown/server/settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ settingsRegistry.add('Markdown_Parser', 'original', {
group: 'Message',
section: 'Markdown',
public: true,
alert: 'Use_Legacy_Message_Template_alert',
alert: 'This_is_a_deprecated_feature_alert',
});

const enableQueryOriginal = { _id: 'Markdown_Parser', value: 'original' };
Expand All @@ -29,6 +29,7 @@ settingsRegistry.add('Markdown_Headers', false, {
section: 'Markdown',
public: true,
enableQuery: enableQueryOriginal,
alert: 'This_is_a_deprecated_feature_alert',
});
settingsRegistry.add('Markdown_SupportSchemesForLink', 'http,https', {
type: 'string',
Expand All @@ -37,6 +38,7 @@ settingsRegistry.add('Markdown_SupportSchemesForLink', 'http,https', {
public: true,
i18nDescription: 'Markdown_SupportSchemesForLink_Description',
enableQuery: enableQueryOriginal,
alert: 'This_is_a_deprecated_feature_alert',
});

const enableQueryMarked = { _id: 'Markdown_Parser', value: 'marked' };
Expand All @@ -46,26 +48,30 @@ settingsRegistry.add('Markdown_Marked_GFM', true, {
section: 'Markdown',
public: true,
enableQuery: enableQueryMarked,
alert: 'This_is_a_deprecated_feature_alert',
});
settingsRegistry.add('Markdown_Marked_Tables', true, {
type: 'boolean',
group: 'Message',
section: 'Markdown',
public: true,
enableQuery: enableQueryMarked,
alert: 'This_is_a_deprecated_feature_alert',
});
settingsRegistry.add('Markdown_Marked_Breaks', true, {
type: 'boolean',
group: 'Message',
section: 'Markdown',
public: true,
enableQuery: enableQueryMarked,
alert: 'This_is_a_deprecated_feature_alert',
});
settingsRegistry.add('Markdown_Marked_Pedantic', false, {
type: 'boolean',
group: 'Message',
section: 'Markdown',
public: true,
alert: 'This_is_a_deprecated_feature_alert',
enableQuery: [
{
_id: 'Markdown_Parser',
Expand All @@ -83,11 +89,13 @@ settingsRegistry.add('Markdown_Marked_SmartLists', true, {
section: 'Markdown',
public: true,
enableQuery: enableQueryMarked,
alert: 'This_is_a_deprecated_feature_alert',
});
settingsRegistry.add('Markdown_Marked_Smartypants', true, {
type: 'boolean',
group: 'Message',
section: 'Markdown',
public: true,
enableQuery: enableQueryMarked,
alert: 'This_is_a_deprecated_feature_alert',
});
1 change: 1 addition & 0 deletions apps/meteor/app/message-snippet/server/startup/settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ settingsRegistry.add('Message_AllowSnippeting', false, {
type: 'boolean',
public: true,
group: 'Message',
alert: 'This_is_a_deprecated_feature_alert',
});
2 changes: 1 addition & 1 deletion apps/meteor/client/views/account/preferences/PreferencesGlobalSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const PreferencesGlobalSection = ({ onChange, commitRef, ...props }: FormSection
<ToggleSwitch checked={useLegacyMessageTemplate} onChange={handleUseLegacyMessageTemplate} />
</Field.Row>
</Field>
<Callout type='warning'>{t('Use_Legacy_Message_Template_alert')}</Callout>
<Callout type='warning'>{t('This_is_a_deprecated_feature_alert')}</Callout>
</FieldGroup>
</Accordion.Item>
);
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1766,7 +1766,6 @@
"Empty_no_agent_selected": "Empty, no agent selected",
"Empty_title": "Empty title",
"Use_Legacy_Message_Template": "Use legacy message template",
"Use_Legacy_Message_Template_alert": "This is a deprecated feature. It may not work as expected and will not get new updates",
"Enable": "Enable",
"Enable_Auto_Away": "Enable Auto Away",
"Enable_CSP": "Enable Content-Security-Policy",
Expand Down Expand Up @@ -4725,6 +4724,7 @@
"This_email_has_already_been_used_and_has_not_been_verified__Please_change_your_password": "This email has already been used and has not been verified. Please change your password.",
"This_feature_is_currently_in_alpha": "This feature is currently in alpha!",
"This_is_a_desktop_notification": "This is a desktop notification",
"This_is_a_deprecated_feature_alert": "This is a deprecated feature. It may not work as expected and will not get new updates.",
"This_is_a_push_test_messsage": "This is a push test message",
"This_message_was_rejected_by__peer__peer": "This message was rejected by <em>__peer__</em> peer.",
"This_monitor_was_already_selected": "This monitor was already selected",
Expand Down