@spinnaker/core 0.14.2 → 0.16.1

package/src/application/modal/validation/ApplicationNameValidator.spec.ts

@@ -1,6 +1,7 @@
 import { mock } from 'angular';
 
-import { ApplicationNameValidator, IApplicationNameValidationResult } from './ApplicationNameValidator';
+import type { IApplicationNameValidationResult } from './ApplicationNameValidator';
+import { ApplicationNameValidator } from './ApplicationNameValidator';
 import { ExampleApplicationNameValidator, ExampleApplicationNameValidator2 } from './ExampleApplicationNameValidator';
 import { AccountService } from '../../../account/AccountService';
 

package/src/application/modal/validation/validateApplicationName.directive.spec.ts

@@ -1,8 +1,9 @@
-import { ICompileService, IQService, IRootScopeService, mock } from 'angular';
+import type { ICompileService, IQService, IRootScopeService } from 'angular';
+import { mock } from 'angular';
 
 import { ExampleApplicationNameValidator, ExampleApplicationNameValidator2 } from './ExampleApplicationNameValidator';
-import { VALIDATE_APPLICATION_NAME } from './validateApplicationName.directive';
 import { AccountService } from '../../../account/AccountService';
+import { VALIDATE_APPLICATION_NAME } from './validateApplicationName.directive';
 
 describe('Validator: validateApplicationName', function () {
   const validator1 = new ExampleApplicationNameValidator();

package/src/application/nav/ApplicationNavigation.spec.tsx

@@ -1,25 +1,26 @@
+import { StateMatcher } from '@uirouter/core';
+import type { UIRouterReact } from '@uirouter/react';
+import { UIRouterContext } from '@uirouter/react';
+import { mock } from 'angular';
+import { mount } from 'enzyme';
 import React from 'react';
 import { RecoilRoot } from 'recoil';
-import { mount } from 'enzyme';
-import { mock } from 'angular';
-import { UIRouterReact, UIRouterContext } from '@uirouter/react';
-import { StateMatcher } from '@uirouter/core';
 
-import { REACT_MODULE } from '../../reactShims';
-import { OVERRIDE_REGISTRY } from '../../overrideRegistry';
 import {
   mockAppConfigDataSourceConfig,
-  mockServerGroupDataSourceConfig,
   mockLoadBalancerDataSourceConfig,
-  mockTaskDataSourceConfig,
   mockPipelineDataSourceConfig,
+  mockServerGroupDataSourceConfig,
+  mockTaskDataSourceConfig,
 } from '@spinnaker/mocks';
-import { ApplicationModelBuilder } from '../../application';
-import { IPipeline } from '../../domain';
-import { ApplicationDataSource } from '../service/applicationDataSource';
 
 import { ApplicationNavigation } from './ApplicationNavigation';
+import { ApplicationModelBuilder } from '../../application';
 import { SETTINGS } from '../../config';
+import type { IPipeline } from '../../domain';
+import { OVERRIDE_REGISTRY } from '../../overrideRegistry';
+import { REACT_MODULE } from '../../reactShims';
+import type { ApplicationDataSource } from '../service/applicationDataSource';
 
 describe('ApplicationNavigation', () => {
   let $uiRouter: UIRouterReact;

package/src/application/nav/NavItem.spec.tsx

@@ -1,13 +1,15 @@
+import { mount } from 'enzyme';
 import React from 'react';
 import { RecoilRoot } from 'recoil';
-import { mount } from 'enzyme';
 import { BehaviorSubject } from 'rxjs';
 
-import { mockEntityTags, mockServerGroupDataSourceConfig, mockPipelineDataSourceConfig } from '@spinnaker/mocks';
-import { Application, ApplicationModelBuilder } from '../../application';
-import { ApplicationDataSource, IDataSourceConfig } from '../service/applicationDataSource';
-import { IEntityTags, IServerGroup, IPipeline } from '../../domain';
+import { mockEntityTags, mockPipelineDataSourceConfig, mockServerGroupDataSourceConfig } from '@spinnaker/mocks';
+
 import { NavItem } from './NavItem';
+import type { Application } from '../../application';
+import { ApplicationModelBuilder } from '../../application';
+import type { IEntityTags, IPipeline, IServerGroup } from '../../domain';
+import type { ApplicationDataSource, IDataSourceConfig } from '../service/applicationDataSource';
 
 describe('NavItem', () => {
   const buildApp = <T,>(config: IDataSourceConfig<T>): Application =>

package/src/application/nav/NavSection.spec.tsx

@@ -1,13 +1,14 @@
-import React from 'react';
 import { shallow } from 'enzyme';
+import React from 'react';
 
 import {
   mockLoadBalancerDataSourceConfig,
   mockPipelineDataSourceConfig,
   mockServerGroupDataSourceConfig,
 } from '@spinnaker/mocks';
-import { ApplicationModelBuilder } from '../../application';
+
 import { NavSection } from './NavSection';
+import { ApplicationModelBuilder } from '../../application';
 
 describe('NavItem', () => {
   it('should render multiple categories', () => {

package/src/application/search/Applications.tsx

@@ -8,9 +8,11 @@ import { distinctUntilChanged, map, takeUntil } from 'rxjs/operators';
 import { ApplicationTable } from './ApplicationsTable';
 import { PaginationControls } from './PaginationControls';
 import type { IAccount } from '../../account';
+import type { Application } from '../../application';
 import type { ICache } from '../../cache';
 import { ViewStateCache } from '../../cache';
 import { InsightMenu } from '../../insight/InsightMenu';
+import { ModalInjector, ReactInjector } from '../../reactShims';
 import type { IApplicationSummary } from '../service/ApplicationReader';
 import { ApplicationReader } from '../service/ApplicationReader';
 import { Spinner } from '../../widgets';
@@ -22,6 +24,10 @@ interface IViewState {
   sort: string;
 }
 
+interface IApplicationsStateParams {
+  create?: string;
+}
+
 export interface IApplicationPagination {
   currentPage: number;
   itemsPerPage: number;
@@ -113,6 +119,48 @@ export class Applications extends React.Component<{}, IApplicationsState> {
           throw error;
         },
       );
+
+    const { $stateParams, $state, $rootScope, overrideRegistry } = ReactInjector;
+    const { create } = $stateParams as IApplicationsStateParams;
+    applicationSummaries$.subscribe((applications: IApplicationSummary[]) => {
+      if (create) {
+        const found = applications.find((app) => app.name === create);
+        if (found) {
+          if (found.email) {
+            // Application already exists - redirect to app
+            $state.go('home.applications.application', { application: create, create: null });
+          } else {
+            // Inferred application - redirect to config
+            $state.go('home.applications.application.config', { application: create, create: null });
+          }
+        } else {
+          // Nonexistant application - open create modal
+          ModalInjector.modalService
+            .open({
+              scope: $rootScope.$new(),
+              templateUrl: overrideRegistry.getTemplate(
+                'createApplicationModal',
+                require('../modal/newapplication.html'),
+              ),
+              resolve: {
+                name: () => create,
+              },
+              controller: overrideRegistry.getController('CreateApplicationModalCtrl'),
+              controllerAs: 'newAppModal',
+            })
+            .result.then(
+              (app: Application) => {
+                $state.go('home.applications.application', { application: app.name, create: null });
+              },
+              () => {
+                // Clear out the query parameter if the dialog is dismissed
+                $state.go('home.applications', { create: null });
+              },
+            )
+            .catch(() => {});
+        }
+      }
+    });
   }
 
   private toggleSort(column: string): void {

package/src/application/service/ApplicationReader.spec.ts

@@ -1,16 +1,21 @@
 import { mock } from 'angular';
-import { mockHttpClient } from '../../api/mock/jasmine';
 
-import Spy = jasmine.Spy;
-import { IApplicationDataSourceAttribute, ApplicationReader } from './ApplicationReader';
 import { ApplicationDataSourceRegistry } from './ApplicationDataSourceRegistry';
-import { Application } from '../application.model';
+import type { IApplicationDataSourceAttribute } from './ApplicationReader';
+import { ApplicationReader } from './ApplicationReader';
+import { mockHttpClient } from '../../api/mock/jasmine';
+import type { Application } from '../application.model';
+import type { ClusterService } from '../../cluster/cluster.service';
+import { CLUSTER_SERVICE } from '../../cluster/cluster.service';
 import { LOAD_BALANCER_DATA_SOURCE } from '../../loadBalancer/loadBalancer.dataSource';
-import { LOAD_BALANCER_READ_SERVICE, LoadBalancerReader } from '../../loadBalancer/loadBalancer.read.service';
-import { SECURITY_GROUP_READER, SecurityGroupReader } from '../../securityGroup/securityGroupReader.service';
-import { CLUSTER_SERVICE, ClusterService } from '../../cluster/cluster.service';
-import { SERVER_GROUP_DATA_SOURCE } from '../../serverGroup/serverGroup.dataSource';
+import type { LoadBalancerReader } from '../../loadBalancer/loadBalancer.read.service';
+import { LOAD_BALANCER_READ_SERVICE } from '../../loadBalancer/loadBalancer.read.service';
 import { SECURITY_GROUP_DATA_SOURCE } from '../../securityGroup/securityGroup.dataSource';
+import type { SecurityGroupReader } from '../../securityGroup/securityGroupReader.service';
+import { SECURITY_GROUP_READER } from '../../securityGroup/securityGroupReader.service';
+import { SERVER_GROUP_DATA_SOURCE } from '../../serverGroup/serverGroup.dataSource';
+
+import Spy = jasmine.Spy;
 
 describe('ApplicationReader', function () {
   let securityGroupReader: SecurityGroupReader;

package/src/application/service/ApplicationWriter.spec.ts

@@ -1,7 +1,9 @@
 import { mock } from 'angular';
 
-import { ApplicationWriter, IApplicationAttributes } from './ApplicationWriter';
-import { IJob, TaskExecutor } from '../../task/taskExecutor';
+import type { IApplicationAttributes } from './ApplicationWriter';
+import { ApplicationWriter } from './ApplicationWriter';
+import type { IJob } from '../../task/taskExecutor';
+import { TaskExecutor } from '../../task/taskExecutor';
 import Spy = jasmine.Spy;
 
 describe('ApplicationWriter', function () {

package/src/application/service/InferredApplicationWarningService.spec.ts

@@ -1,10 +1,9 @@
 import Spy = jasmine.Spy;
 
-import { NotifierService } from '../../widgets/notifier/notifier.service';
-
 import { InferredApplicationWarningService } from './InferredApplicationWarningService';
-import { Application } from '../application.model';
+import type { Application } from '../application.model';
 import { ApplicationModelBuilder } from '../applicationModel.builder';
+import { NotifierService } from '../../widgets/notifier/notifier.service';
 
 describe('Service: inferredApplicationWarning', () => {
   describe('checkIfInferredAndWarn', () => {

package/src/artifact/expectedArtifact.service.spec.ts

@@ -1,6 +1,7 @@
 import { noop } from 'lodash';
+
+import type { IArtifact, IArtifactKindConfig } from '../domain';
 import { ExpectedArtifactService } from './expectedArtifact.service';
-import { IArtifact, IArtifactKindConfig } from '../domain';
 import { Registry } from '../registry';
 
 describe('ExpectedArtifactService', () => {

package/src/artifact/react/ExpectedArtifactSelector.spec.tsx

@@ -1,10 +1,9 @@
-import React from 'react';
 import { mount } from 'enzyme';
+import React from 'react';
 
 import { ExpectedArtifactService } from '..';
-import { IExpectedArtifact } from '../../domain';
-
 import { ExpectedArtifactSelector } from './ExpectedArtifactSelector';
+import type { IExpectedArtifact } from '../../domain';
 
 const artifact = (type: string): IExpectedArtifact => {
   const ea = ExpectedArtifactService.createEmptyArtifact();

package/src/authentication/AuthenticationInitializer.spec.ts

@@ -1,10 +1,11 @@
+/* eslint-disable @spinnaker/migrate-to-mock-http-client */
 import { mock } from 'angular';
 
-import { IDeckRootScope } from '../domain';
 import { AuthenticationInitializer } from './AuthenticationInitializer';
 import { AuthenticationService } from './AuthenticationService';
 import { AUTHENTICATION_MODULE } from './authentication.module';
 import { SETTINGS } from '../config/settings';
+import type { IDeckRootScope } from '../domain';
 
 declare const window: any;
 describe('authenticationProvider: application startup', function () {

package/src/authentication/AuthenticationService.spec.ts

@@ -1,4 +1,5 @@
-import { AuthenticationService, IUser } from './AuthenticationService';
+import type { IUser } from './AuthenticationService';
+import { AuthenticationService } from './AuthenticationService';
 
 describe('AuthenticationService', function () {
   beforeEach(() => AuthenticationService.reset());

package/src/authentication/authentication.interceptor.spec.ts

@@ -1,7 +1,9 @@
-import { IQService, IRequestConfig, IRootScopeService, mock } from 'angular';
+import type { IQService, IRequestConfig, IRootScopeService } from 'angular';
+import { mock } from 'angular';
 
-import { AUTHENTICATION_INTERCEPTOR_SERVICE, AuthenticationInterceptor } from './authentication.interceptor.service';
 import { AuthenticationService } from './AuthenticationService';
+import type { AuthenticationInterceptor } from './authentication.interceptor.service';
+import { AUTHENTICATION_INTERCEPTOR_SERVICE } from './authentication.interceptor.service';
 import { SETTINGS } from '../config/settings';
 
 describe('authenticationInterceptor', function () {

package/src/cache/cacheInitializer.service.spec.ts

@@ -1,10 +1,13 @@
+import type { IQService, IRootScopeService } from 'angular';
+import { mock } from 'angular';
 import { flatten } from 'lodash';
 
-import { mock, IQService, IRootScopeService } from 'angular';
-import { CACHE_INITIALIZER_SERVICE, CacheInitializerService } from './cacheInitializer.service';
-import { AccountService } from '../account/AccountService';
 import { InfrastructureCaches } from './';
-import { SECURITY_GROUP_READER, SecurityGroupReader } from '../securityGroup/securityGroupReader.service';
+import { AccountService } from '../account/AccountService';
+import type { CacheInitializerService } from './cacheInitializer.service';
+import { CACHE_INITIALIZER_SERVICE } from './cacheInitializer.service';
+import type { SecurityGroupReader } from '../securityGroup/securityGroupReader.service';
+import { SECURITY_GROUP_READER } from '../securityGroup/securityGroupReader.service';
 
 interface IKeys {
   [key: string]: string[];

package/src/cache/infrastructureCaches.spec.ts

@@ -1,9 +1,9 @@
-import { CacheFactory, CacheOptions } from 'cachefactory';
-
-import { noop } from '../utils';
+import type { CacheFactory, CacheOptions } from 'cachefactory';
 
+import type { ICache, ICacheConfig } from './deckCacheFactory';
+import { DeckCacheFactory } from './deckCacheFactory';
 import { InfrastructureCaches } from './infrastructureCaches';
-import { DeckCacheFactory, ICacheConfig, ICache } from './deckCacheFactory';
+import { noop } from '../utils';
 
 interface ICacheInstantiation {
   cacheId: string;

package/src/chaosMonkey/chaosMonkeyExceptions.component.spec.ts

@@ -1,9 +1,11 @@
-import { mock, IComponentControllerService, IScope, IQService, IRootScopeService } from 'angular';
+import type { IComponentControllerService, IQService, IRootScopeService, IScope } from 'angular';
+import { mock } from 'angular';
 
-import { CHAOS_MONKEY_EXCEPTIONS_COMPONENT, ChaosMonkeyExceptionsController } from './chaosMonkeyExceptions.component';
 import { AccountService } from '../account/AccountService';
 import { ApplicationModelBuilder } from '../application/applicationModel.builder';
 import { ChaosMonkeyConfig } from './chaosMonkeyConfig.component';
+import type { ChaosMonkeyExceptionsController } from './chaosMonkeyExceptions.component';
+import { CHAOS_MONKEY_EXCEPTIONS_COMPONENT } from './chaosMonkeyExceptions.component';
 
 describe('Controller: ChaosMonkeyExceptions', () => {
   let $componentController: IComponentControllerService,

package/src/cloudProvider/providerSelection/ProviderSelectionService.spec.ts

@@ -1,11 +1,13 @@
-import { ApplicationModelBuilder } from '../../application/applicationModel.builder';
-import { Application } from '../../application/application.model';
-import { mock, IQService, IScope, IRootScopeService } from 'angular';
+import type { IQService, IRootScopeService, IScope } from 'angular';
+import { mock } from 'angular';
 
-import { AccountService, IAccountDetails } from '../../account/AccountService';
 import { CloudProviderRegistry } from '..';
 import { ProviderSelectionModal } from './ProviderSelectionModal';
 import { ProviderSelectionService } from './ProviderSelectionService';
+import type { IAccountDetails } from '../../account/AccountService';
+import { AccountService } from '../../account/AccountService';
+import type { Application } from '../../application/application.model';
+import { ApplicationModelBuilder } from '../../application/applicationModel.builder';
 import { SETTINGS } from '../../config/settings';
 
 function fakeAccount(provider: string): IAccountDetails {
@@ -182,7 +184,7 @@ describe('ProviderSelectionService: API', () => {
     const k8s = fakeAccount('kubernetes');
     k8s.type = 'kubernetes';
     accounts = [k8s];
-    let configuration = {
+    const configuration = {
       name: 'Kubernetes',
       adHocInfrastructureWritesEnabled: true,
     };
@@ -200,7 +202,7 @@ describe('ProviderSelectionService: API', () => {
     const k8s = fakeAccount('kubernetes');
     k8s.type = 'kubernetes';
     accounts = [k8s];
-    let configuration = {
+    const configuration = {
       name: 'Kubernetes',
       adHocInfrastructureWritesEnabled: false,
     };
@@ -218,7 +220,7 @@ describe('ProviderSelectionService: API', () => {
     const k8s = fakeAccount('gce');
     k8s.type = 'gce';
     accounts = [k8s];
-    let configuration = {
+    const configuration = {
       name: 'Kubernetes',
     };
     CloudProviderRegistry.registerProvider('gce', configuration);
@@ -235,7 +237,7 @@ describe('ProviderSelectionService: API', () => {
     const k8s = fakeAccount('kubernetes');
     k8s.type = 'kubernetes';
     accounts = [k8s, fakeAccount('gce')];
-    let configuration = {
+    const configuration = {
       name: 'Kubernetes',
       adHocInfrastructureWritesEnabled: false,
     };
@@ -254,7 +256,7 @@ describe('ProviderSelectionService: API', () => {
     const k8s = fakeAccount('kubernetes');
     k8s.type = 'kubernetes';
     accounts = [k8s, fakeAccount('gce')];
-    let configuration = {
+    const configuration = {
       name: 'Kubernetes',
       adHocInfrastructureWritesEnabled: true,
     };
@@ -279,7 +281,7 @@ describe('ProviderSelectionService: API', () => {
       k8s_account.type = 'kubernetes';
 
       accounts = [k8s_account];
-      let configuration = {
+      const configuration = {
         name: 'kubernetes',
         adHocInfrastructureWritesEnabled: true,
       };
@@ -300,7 +302,7 @@ describe('ProviderSelectionService: API', () => {
       k8s_account.type = 'kubernetes';
 
       accounts = [k8s_account];
-      let configuration = {
+      const configuration = {
         name: 'kubernetes',
         adHocInfrastructureWritesEnabled: false,
       };
@@ -322,7 +324,7 @@ describe('ProviderSelectionService: API', () => {
       const k8s_account = fakeAccount('kubernetes');
       k8s_account.type = 'kubernetes';
       accounts = [k8s_account, fakeAccount('gce')];
-      let kubernetes_configuration = {
+      const kubernetes_configuration = {
         name: 'Kubernetes',
         adHocInfrastructureWritesEnabled: false,
       };
@@ -350,7 +352,7 @@ describe('ProviderSelectionService: API', () => {
       k8s_account_2.type = 'kubernetes';
 
       accounts = [k8s_account_1, k8s_account_2];
-      let configuration = {
+      const configuration = {
         name: 'kubernetes',
         adHocInfrastructureWritesEnabled: false,
       };
@@ -371,7 +373,7 @@ describe('ProviderSelectionService: API', () => {
       aws_account.type = 'aws';
 
       accounts = [aws_account];
-      let configuration = {
+      const configuration = {
         name: 'aws',
         adHocInfrastructureWritesEnabled: false,
       };
@@ -392,7 +394,7 @@ describe('ProviderSelectionService: API', () => {
       aws_account.type = 'aws';
 
       accounts = [aws_account];
-      let configuration = {
+      const configuration = {
         name: 'aws',
         adHocInfrastructureWritesEnabled: false,
       };
@@ -415,11 +417,11 @@ describe('ProviderSelectionService: API', () => {
       aws_account.type = 'aws';
 
       accounts = [k8s_account, aws_account];
-      let k8s_configuration = {
+      const k8s_configuration = {
         name: 'kubernetes',
         adHocInfrastructureWritesEnabled: false,
       };
-      let aws_configuration = {
+      const aws_configuration = {
         name: 'aws',
         adHocInfrastructureWritesEnabled: false,
       };
@@ -445,11 +447,11 @@ describe('ProviderSelectionService: API', () => {
       aws_account.type = 'aws';
 
       accounts = [k8s_account, aws_account];
-      let k8s_configuration = {
+      const k8s_configuration = {
         name: 'kubernetes',
         adHocInfrastructureWritesEnabled: true,
       };
-      let aws_configuration = {
+      const aws_configuration = {
         name: 'aws',
         adHocInfrastructureWritesEnabled: true,
       };
@@ -480,11 +482,11 @@ describe('ProviderSelectionService: API', () => {
       aws_account.type = 'aws';
 
       accounts = [k8s_account, aws_account];
-      let k8s_configuration = {
+      const k8s_configuration = {
         name: 'kubernetes',
         adHocInfrastructureWritesEnabled: false,
       };
-      let aws_configuration = {
+      const aws_configuration = {
         name: 'aws',
         adHocInfrastructureWritesEnabled: true,
       };

package/src/cluster/ClusterRuleMatcher.spec.ts

@@ -1,4 +1,5 @@
-import { DefaultClusterMatcher, IClusterMatcher, IClusterMatchRule } from './ClusterRuleMatcher';
+import type { IClusterMatcher, IClusterMatchRule } from './ClusterRuleMatcher';
+import { DefaultClusterMatcher } from './ClusterRuleMatcher';
 
 describe('CustomRuleMatcher', () => {
   let matcher: IClusterMatcher;

package/src/cluster/cluster.service.spec.ts

@@ -1,15 +1,15 @@
-import { mockHttpClient } from '../api/mock/jasmine';
 import { mock } from 'angular';
 import { find } from 'lodash';
 
-import { REACT_MODULE } from '../reactShims';
-import * as State from '../state';
+import { mockHttpClient } from '../api/mock/jasmine';
+import type { Application } from '../application/application.model';
 import { ApplicationModelBuilder } from '../application/applicationModel.builder';
-import { IInstanceCounts, IServerGroup } from '../domain';
-import { Application } from '../application/application.model';
-
-import { CLUSTER_SERVICE, ClusterService } from './cluster.service';
+import type { ClusterService } from './cluster.service';
+import { CLUSTER_SERVICE } from './cluster.service';
 import { SETTINGS } from '../config/settings';
+import type { IInstanceCounts, IServerGroup } from '../domain';
+import { REACT_MODULE } from '../reactShims';
+import * as State from '../state';
 
 const ClusterState = State.ClusterState;
 

package/src/cluster/filter/ClusterFilterService.spec.ts

@@ -1,10 +1,11 @@
 import { mock } from 'angular';
-import { REACT_MODULE } from '../../reactShims';
-import { CLUSTER_SERVICE } from '../cluster.service';
-import { Application } from '../../application/application.model';
+import { cloneDeep, filter } from 'lodash';
+
+import type { Application } from '../../application/application.model';
 import { ApplicationModelBuilder } from '../../application/applicationModel.builder';
+import { CLUSTER_SERVICE } from '../cluster.service';
+import { REACT_MODULE } from '../../reactShims';
 import * as State from '../../state';
-import { cloneDeep, filter } from 'lodash';
 
 const ClusterState = State.ClusterState;
 
@@ -324,8 +325,8 @@ describe('Service: clusterFilterService', function () {
 
   describe('filter by starting status', function () {
     it('should filter by starting status if checked', function (done) {
-      const starting: any = { healthState: 'Unknown' },
-        serverGroup = application.getDataSource('serverGroups').data[0];
+      const starting: any = { healthState: 'Unknown' };
+      const serverGroup = application.getDataSource('serverGroups').data[0];
       serverGroup.instances.push(starting);
 
       ClusterState.filterModel.asFilterModel.sortFilter.status = { Starting: true };
@@ -348,8 +349,8 @@ describe('Service: clusterFilterService', function () {
 
   describe('filter by out of service status', function () {
     it('should filter out by out of service status if checked', function (done) {
-      const starting: any = { healthState: 'Unknown' },
-        serverGroup = application.getDataSource('serverGroups').data[0];
+      const starting: any = { healthState: 'Unknown' };
+      const serverGroup = application.getDataSource('serverGroups').data[0];
       serverGroup.instances.push(starting);
 
       ClusterState.filterModel.asFilterModel.sortFilter.status = { OutOfService: true };
@@ -363,8 +364,8 @@ describe('Service: clusterFilterService', function () {
 
   describe('filter by unknown status', function () {
     it('should filter out by unknown status if checked', function (done) {
-      const starting: any = { healthState: 'Up' },
-        serverGroup = application.getDataSource('serverGroups').data[0];
+      const starting: any = { healthState: 'Up' };
+      const serverGroup = application.getDataSource('serverGroups').data[0];
       serverGroup.instances.push(starting);
 
       ClusterState.filterModel.asFilterModel.sortFilter.status = { Unknown: true };
@@ -650,8 +651,8 @@ describe('Service: clusterFilterService', function () {
 
     it('should remove all instanceIds if server group is no longer visible, and add back when visible again', function (done) {
       ClusterState.filterModel.asFilterModel.sortFilter.listInstances = true;
-      const serverGroup = application.getDataSource('serverGroups').data[0],
-        multiselectGroup = ClusterState.multiselectModel.getOrCreateInstanceGroup(serverGroup);
+      const serverGroup = application.getDataSource('serverGroups').data[0];
+      const multiselectGroup = ClusterState.multiselectModel.getOrCreateInstanceGroup(serverGroup);
 
       serverGroup.instances.push({ id: 'i-1234' });
       ClusterState.multiselectModel.toggleSelectAll(serverGroup, ['i-1234']);
@@ -1133,8 +1134,8 @@ describe('Service: clusterFilterService', function () {
     });
 
     it('adds executions and running tasks, even when stringVal does not change', function (done) {
-      const runningTasks: any = [{ name: 'a' }],
-        executions: any = [{ name: 'b' }];
+      const runningTasks: any = [{ name: 'a' }];
+      const executions: any = [{ name: 'b' }];
       application = this.buildApplication({
         serverGroups: {
           data: [

package/src/cluster/filter/LabelFilter.spec.tsx

@@ -1,10 +1,10 @@
-import React from 'react';
 import { shallow } from 'enzyme';
+import React from 'react';
 
+import type { ILabelFilterProps } from './LabelFilter';
+import LabelFilter, { LabelFilterSelect } from './LabelFilter';
 import { noop } from '../../utils';
 
-import LabelFilter, { ILabelFilterProps, LabelFilterSelect } from './LabelFilter';
-
 describe('<LabelFilter />', () => {
   let props: ILabelFilterProps;
   beforeEach(() => {

package/src/cluster/filter/MultiselectModel.spec.ts

@@ -1,8 +1,8 @@
+import { MultiselectModel } from './MultiselectModel';
 import { ReactInjector } from '../../reactShims';
 import * as State from '../../state';
-const { ClusterState } = State;
 
-import { MultiselectModel } from './MultiselectModel';
+const { ClusterState } = State;
 
 describe('Multiselect Model', () => {
   let multiselectModel: MultiselectModel;

package/src/cluster/filter/labelFilterUtils.spec.ts

@@ -1,10 +1,6 @@
-import {
-  buildLabelsMap,
-  labelFiltersToTrueKeyObject,
-  trueKeyObjectToLabelFilters,
-  ILabelFilter,
-} from './labelFilterUtils';
-import { IServerGroup } from '../../domain/IServerGroup';
+import type { IServerGroup } from '../../domain/IServerGroup';
+import type { ILabelFilter } from './labelFilterUtils';
+import { buildLabelsMap, labelFiltersToTrueKeyObject, trueKeyObjectToLabelFilters } from './labelFilterUtils';
 
 describe('Label filter utils', () => {
   let labelFilters: ILabelFilter[];