summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Rohlfs <brohlfs@google.com>2023-10-23 14:55:01 +0200
committerLuca Milanesio <luca.milanesio@gmail.com>2023-10-26 21:12:14 +0000
commit21851e5cdd60e5db91be46aed5507b74552f87c4 (patch)
tree80b0af1c53c7a16c82c3774d3ac9cd2e449ced7b
parent5baafc655da2bcfa43714eb5da6611ff98c6e9fb (diff)
Remove obsolete `getFilterDocsLink`
The method was unused since change 383439. Release-Notes: skip Change-Id: I784f93260be9fc9a903d559a5f6d236adb18aba3 (cherry picked from commit 825076a4fa600daf6cfd2949a11984811821952c)
-rw-r--r--polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.ts30
-rw-r--r--polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view_test.ts43
2 files changed, 0 insertions, 73 deletions
diff --git a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.ts b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.ts
index 7f1595dbb5..3194f38369 100644
--- a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.ts
+++ b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.ts
@@ -70,13 +70,6 @@ import {
import {modalStyles} from '../../../styles/gr-modal-styles';
import {navigationToken} from '../../core/gr-navigation/gr-navigation';
import {rootUrl} from '../../../utils/url-util';
-import {configModelToken} from '../../../models/config/config-model';
-
-const GERRIT_DOCS_BASE_URL =
- 'https://gerrit-review.googlesource.com/' + 'Documentation';
-const GERRIT_DOCS_FILTER_PATH = '/user-notify.html';
-const ABSOLUTE_URL_PATTERN = /^https?:/;
-const TRAILING_SLASH_PATTERN = /\/$/;
const HTTP_AUTH = ['HTTP', 'HTTP_LDAP'];
@@ -188,9 +181,6 @@ export class GrSettingsView extends LitElement {
// private but used in test
@state() serverConfig?: ServerInfo;
- // private but used in test
- @state() docsBaseUrl?: string | null;
-
@state() private emailsChanged = false;
// private but used in test
@@ -210,8 +200,6 @@ export class GrSettingsView extends LitElement {
private readonly getUserModel = resolve(this, userModelToken);
- private readonly getConfigModel = resolve(this, configModelToken);
-
// private but used in test
readonly flagsService = getAppContext().flagsService;
@@ -238,11 +226,6 @@ export class GrSettingsView extends LitElement {
);
subscribe(
this,
- () => this.getConfigModel().docsBaseUrl$,
- docsBaseUrl => (this.docsBaseUrl = docsBaseUrl)
- );
- subscribe(
- this,
() => this.getUserModel().preferences$,
prefs => {
if (!prefs) {
@@ -1171,19 +1154,6 @@ export class GrSettingsView extends LitElement {
}
// private but used in test
- getFilterDocsLink(docsBaseUrl?: string | null) {
- let base = docsBaseUrl;
- if (!base || !ABSOLUTE_URL_PATTERN.test(base)) {
- base = GERRIT_DOCS_BASE_URL;
- }
-
- // Remove any trailing slash, since it is in the GERRIT_DOCS_FILTER_PATH.
- base = base.replace(TRAILING_SLASH_PATTERN, '');
-
- return base + GERRIT_DOCS_FILTER_PATH;
- }
-
- // private but used in test
showHttpAuth() {
if (this.serverConfig?.auth?.git_basic_auth_policy) {
return HTTP_AUTH.includes(
diff --git a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view_test.ts b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view_test.ts
index 30a2922922..40c6f74051 100644
--- a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view_test.ts
+++ b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view_test.ts
@@ -121,10 +121,6 @@ suite('gr-settings-view tests', () => {
});
test('renders', async () => {
- sinon
- .stub(element, 'getFilterDocsLink')
- .returns('https://test.com/user-notify.html');
- element.docsBaseUrl = 'https://test.com';
await element.updateComplete;
// this cannot be formatted with /* HTML */, because it breaks test
assert.shadowDom.equal(
@@ -777,45 +773,6 @@ suite('gr-settings-view tests', () => {
assert.isFalse(element.showHttpAuth());
});
- suite('getFilterDocsLink', () => {
- test('with http: docs base URL', () => {
- const base = 'http://example.com/';
- const result = element.getFilterDocsLink(base);
- assert.equal(result, 'http://example.com/user-notify.html');
- });
-
- test('with http: docs base URL without slash', () => {
- const base = 'http://example.com';
- const result = element.getFilterDocsLink(base);
- assert.equal(result, 'http://example.com/user-notify.html');
- });
-
- test('with https: docs base URL', () => {
- const base = 'https://example.com/';
- const result = element.getFilterDocsLink(base);
- assert.equal(result, 'https://example.com/user-notify.html');
- });
-
- test('without docs base URL', () => {
- const result = element.getFilterDocsLink(null);
- assert.equal(
- result,
- 'https://gerrit-review.googlesource.com/' +
- 'Documentation/user-notify.html'
- );
- });
-
- test('ignores non HTTP links', () => {
- const base = 'javascript://alert("evil");';
- const result = element.getFilterDocsLink(base);
- assert.equal(
- result,
- 'https://gerrit-review.googlesource.com/' +
- 'Documentation/user-notify.html'
- );
- });
- });
-
suite('when email verification token is provided', () => {
let resolveConfirm: (
value: string | PromiseLike<string | null> | null