From 0445af0a95f3c020c018665081660141048c5ede Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Wed, 21 Aug 2019 14:21:30 -0400 Subject: [PATCH] Clear unused imports and variables (#473) * Clear unused imports and variables * Add trailing newline --- src/server_manager/cloud/digitalocean_api.ts | 2 -- src/server_manager/test_action.sh | 18 ++++++++++++++++++ src/server_manager/web_app/app.spec.ts | 3 +-- src/server_manager/web_app/app.ts | 4 ++-- .../web_app/display_server.spec.ts | 2 +- src/server_manager/web_app/main.ts | 2 +- tslint.json | 1 + 7 files changed, 24 insertions(+), 8 deletions(-) create mode 100755 src/server_manager/test_action.sh diff --git a/src/server_manager/cloud/digitalocean_api.ts b/src/server_manager/cloud/digitalocean_api.ts index fc550527..ab16a0f8 100644 --- a/src/server_manager/cloud/digitalocean_api.ts +++ b/src/server_manager/cloud/digitalocean_api.ts @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -import * as events from 'events'; - import * as errors from '../infrastructure/errors'; export interface DigitalOceanDropletSpecification { diff --git a/src/server_manager/test_action.sh b/src/server_manager/test_action.sh new file mode 100755 index 00000000..e69fa508 --- /dev/null +++ b/src/server_manager/test_action.sh @@ -0,0 +1,18 @@ +#!/bin/bash +# +# Copyright 2018 The Outline Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +yarn do server_manager/electron_app/test +yarn do server_manager/web_app/test diff --git a/src/server_manager/web_app/app.spec.ts b/src/server_manager/web_app/app.spec.ts index 7c12cbd2..a3756f40 100644 --- a/src/server_manager/web_app/app.spec.ts +++ b/src/server_manager/web_app/app.spec.ts @@ -222,7 +222,6 @@ function createTestApp( manualServerRepo?: server.ManualServerRepository, displayServerRepository?: FakeDisplayServerRepository, managedServerRepository?: FakeManagedServerRepository) { - const WEB_APP_URL = 'outline://fakefakefake/'; const VERSION = '0.0.1'; const fakeDigitalOceanSessionFactory = (accessToken: string) => { return new FakeDigitalOceanSession(accessToken); @@ -242,7 +241,7 @@ function createTestApp( displayServerRepository = new FakeDisplayServerRepository(); } return new App( - polymerAppRoot, WEB_APP_URL, VERSION, fakeDigitalOceanSessionFactory, + polymerAppRoot, VERSION, fakeDigitalOceanSessionFactory, fakeDigitalOceanServerRepositoryFactory, manualServerRepo, displayServerRepository, digitalOceanTokenManager); } diff --git a/src/server_manager/web_app/app.ts b/src/server_manager/web_app/app.ts index e07473e3..79d29d4f 100644 --- a/src/server_manager/web_app/app.ts +++ b/src/server_manager/web_app/app.ts @@ -34,7 +34,7 @@ interface PolymerEvent extends Event { // The Outline DigitalOcean team's referral code: // https://www.digitalocean.com/help/referral-program/ -const DIGITALOCEAN_REFERRAL_CODE = '5ddb4219b716'; +const UNUSED_DIGITALOCEAN_REFERRAL_CODE = '5ddb4219b716'; interface UiAccessKey { id: string; @@ -67,7 +67,7 @@ export class App { private serverBeingCreated: server.ManagedServer; constructor( - private appRoot: Polymer, private readonly appUrl: string, private readonly version: string, + private appRoot: Polymer, private readonly version: string, private createDigitalOceanSession: DigitalOceanSessionFactory, private createDigitalOceanServerRepository: DigitalOceanServerRepositoryFactory, private manualServerRepository: server.ManualServerRepository, diff --git a/src/server_manager/web_app/display_server.spec.ts b/src/server_manager/web_app/display_server.spec.ts index 6bf7f873..e4148758 100644 --- a/src/server_manager/web_app/display_server.spec.ts +++ b/src/server_manager/web_app/display_server.spec.ts @@ -13,7 +13,7 @@ // limitations under the License. import {InMemoryStorage} from './app.spec'; -import {DisplayServer, DisplayServerRepository} from './display_server'; +import {DisplayServerRepository} from './display_server'; // Use this helper to compare `DisplayServer`s when we don't care about the // `isSynced` property. diff --git a/src/server_manager/web_app/main.ts b/src/server_manager/web_app/main.ts index ebf9d8b5..da3f0e78 100644 --- a/src/server_manager/web_app/main.ts +++ b/src/server_manager/web_app/main.ts @@ -48,7 +48,7 @@ document.addEventListener('WebComponentsReady', () => { // Create and start the app. new App( - document.getElementById('appRoot'), document.URL, version, + document.getElementById('appRoot'), version, digitalocean_api.createDigitalOceanSession, digitalOceanServerRepositoryFactory, new ManualServerRepository('manualServers'), new DisplayServerRepository(), new DigitalOceanTokenManager()) diff --git a/tslint.json b/tslint.json index c46f0724..32abeaea 100644 --- a/tslint.json +++ b/tslint.json @@ -25,6 +25,7 @@ "no-reference": true, "no-require-imports": true, "no-unused-expression": true, + "no-unused-variable": [true, {"ignore-pattern": "^UNUSED"}], "no-use-before-declare": false, "no-var-keyword": true, "object-literal-shorthand": true,