From 96e1c4c3d76a0ba5667d9f1738ed3fc6be55ae19 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Tue, 25 Jan 2022 15:01:05 -0500 Subject: [PATCH] Drop 'support url' from Galaxy config, preferring the 'help' option that goes to discourse --- client/src/app/__mocks__/index.js | 1 - client/src/layout/menu.js | 6 ------ client/tests/qunit/test-data/bootstrapped.js | 1 - doc/source/admin/galaxy_options.rst | 10 ---------- lib/galaxy/config/sample/galaxy.yml.sample | 3 --- lib/galaxy/config/schemas/config_schema.yml | 8 -------- lib/galaxy/managers/configuration.py | 1 - lib/galaxy_test/api/test_configuration.py | 1 - templates/webapps/galaxy/galaxy.masthead.mako | 1 - 9 files changed, 32 deletions(-) diff --git a/client/src/app/__mocks__/index.js b/client/src/app/__mocks__/index.js index affc3d038d0..57c1c3e70f1 100644 --- a/client/src/app/__mocks__/index.js +++ b/client/src/app/__mocks__/index.js @@ -5,7 +5,6 @@ export function getGalaxyInstance() { allow_user_creation: true, wiki_url: "https://galaxyproject.org/", ftp_upload_site: null, - support_url: "https://galaxyproject.org/support/", allow_user_dataset_purge: false, allow_library_path_paste: false, user_library_import_dir: null, diff --git a/client/src/layout/menu.js b/client/src/layout/menu.js index 124ed2a832d..2cc3cb72ce9 100644 --- a/client/src/layout/menu.js +++ b/client/src/layout/menu.js @@ -177,12 +177,6 @@ export function fetchMenu(options = {}) { target: "_blank", hidden: !options.helpsite_url, }, - { - title: _l("Support"), - url: options.support_url, - target: "_blank", - hidden: !options.support_url, - }, { title: _l("Search"), url: options.search_url, diff --git a/client/tests/qunit/test-data/bootstrapped.js b/client/tests/qunit/test-data/bootstrapped.js index a57216a2020..e80837747c2 100644 --- a/client/tests/qunit/test-data/bootstrapped.js +++ b/client/tests/qunit/test-data/bootstrapped.js @@ -4,7 +4,6 @@ export default { allow_user_creation: true, wiki_url: "https://galaxyproject.org/", ftp_upload_site: null, - support_url: "https://galaxyproject.org/support/", allow_user_dataset_purge: false, allow_library_path_paste: false, user_library_import_dir: null, diff --git a/doc/source/admin/galaxy_options.rst b/doc/source/admin/galaxy_options.rst index 09df38dde6f..a116dbe4b8e 100644 --- a/doc/source/admin/galaxy_options.rst +++ b/doc/source/admin/galaxy_options.rst @@ -2001,16 +2001,6 @@ :Type: str -~~~~~~~~~~~~~~~ -``support_url`` -~~~~~~~~~~~~~~~ - -:Description: - The URL linked by the "Support" link in the "Help" menu. -:Default: ``https://galaxyproject.org/support/`` -:Type: str - - ~~~~~~~~~~~~~~~~ ``citation_url`` ~~~~~~~~~~~~~~~~ diff --git a/lib/galaxy/config/sample/galaxy.yml.sample b/lib/galaxy/config/sample/galaxy.yml.sample index 7fe69d0c013..9122b16fbb7 100644 --- a/lib/galaxy/config/sample/galaxy.yml.sample +++ b/lib/galaxy/config/sample/galaxy.yml.sample @@ -1038,9 +1038,6 @@ galaxy: # The URL linked for quota information in the UI. #quota_url: https://galaxyproject.org/support/account-quotas/ - # The URL linked by the "Support" link in the "Help" menu. - #support_url: https://galaxyproject.org/support/ - # The URL linked by the "How to Cite Galaxy" link in the "Help" menu. #citation_url: https://galaxyproject.org/citing-galaxy diff --git a/lib/galaxy/config/schemas/config_schema.yml b/lib/galaxy/config/schemas/config_schema.yml index 38869fb078a..a70027ebf8c 100644 --- a/lib/galaxy/config/schemas/config_schema.yml +++ b/lib/galaxy/config/schemas/config_schema.yml @@ -1453,14 +1453,6 @@ mapping: desc: | The URL linked for quota information in the UI. - support_url: - type: str - default: https://galaxyproject.org/support/ - required: false - per_host: true - desc: | - The URL linked by the "Support" link in the "Help" menu. - citation_url: type: str default: https://galaxyproject.org/citing-galaxy diff --git a/lib/galaxy/managers/configuration.py b/lib/galaxy/managers/configuration.py index ea0fec99c13..f82ecc59bcd 100644 --- a/lib/galaxy/managers/configuration.py +++ b/lib/galaxy/managers/configuration.py @@ -142,7 +142,6 @@ class ConfigSerializer(base.ModelSerializer): 'mailing_lists': _defaults_to(self.app.config.mailing_lists_url), 'screencasts_url': _use_config, 'citation_url': _use_config, - 'support_url': _use_config, 'quota_url': _use_config, 'helpsite_url': _use_config, 'lims_doc_url': _defaults_to("https://usegalaxy.org/u/rkchak/p/sts"), diff --git a/lib/galaxy_test/api/test_configuration.py b/lib/galaxy_test/api/test_configuration.py index f0e73b98cb7..32eed38fbfd 100644 --- a/lib/galaxy_test/api/test_configuration.py +++ b/lib/galaxy_test/api/test_configuration.py @@ -9,7 +9,6 @@ TEST_KEYS_FOR_ALL_USERS = [ 'enable_unique_workflow_defaults', 'ftp_upload_site', 'wiki_url', - 'support_url', 'logo_url', 'terms_url', 'allow_user_dataset_purge', diff --git a/templates/webapps/galaxy/galaxy.masthead.mako b/templates/webapps/galaxy/galaxy.masthead.mako index cceba95de85..2ef92557138 100644 --- a/templates/webapps/galaxy/galaxy.masthead.mako +++ b/templates/webapps/galaxy/galaxy.masthead.mako @@ -14,7 +14,6 @@ 'remote_user_logout_href' : app.config.remote_user_logout_href, 'lims_doc_url' : app.config.get("lims_doc_url", "https://usegalaxy.org/u/rkchak/p/sts"), 'default_locale' : app.config.default_locale, - 'support_url' : app.config.support_url, 'search_url' : app.config.search_url, 'mailing_lists' : app.config.mailing_lists_url, 'screencasts_url' : app.config.screencasts_url,