@spinnaker/core 0.14.1 → 0.16.0

package/dist/managed/versionMetadata/MetadataComponents.d.ts

@@ -5,17 +5,16 @@ import './VersionMetadata.less';
 export declare const MetadataElement: React.FC<{
     className?: string;
 }>;
-export interface VersionAction {
-    onClick?: () => void;
-    href?: string;
-    content: string;
-    disabled?: boolean;
-}
+export declare const METADATA_TEXT_COLOR = "nobel";
 export interface VersionMessageData {
     by?: string;
     at?: string;
     comment?: string;
 }
+export interface ICompareLinks {
+    previous?: string;
+    current?: string;
+}
 export declare const toPinnedMetadata: (data: {
     pinnedAt?: string;
     pinnedBy?: string;
@@ -27,24 +26,17 @@ export declare const toVetoedMetadata: (data: {
     comment?: string;
 }) => VersionMessageData;
 export interface IVersionMetadataProps {
-    build?: IVersionBuildProps['build'] & Partial<LifecycleEventSummary>;
-    version: string;
-    sha?: string;
+    build?: IVersionBuildProps['build'];
     author?: string;
     deployedAt?: string;
-    createdAt?: IVersionCreatedAtProps['createdAt'];
     buildsBehind?: number;
     isDeploying?: boolean;
+    isPending?: boolean;
     bake?: LifecycleEventSummary;
     pinned?: VersionMessageData;
     vetoed?: VersionMessageData;
-    actions?: VersionAction[];
+    isCurrent?: boolean;
 }
-export interface IVersionMetadataActionsProps {
-    id: string;
-    actions: VersionAction[];
-}
-export declare const VersionMetadataActions: ({ id, actions }: IVersionMetadataActionsProps) => JSX.Element;
 interface IVersionCreatedAtProps {
     createdAt?: string | DateTime;
     linkProps: Record<string, string>;
@@ -59,6 +51,10 @@ declare const badgeTypeToDetails: {
         className: string;
         text: string;
     };
+    deployed: {
+        className: string;
+        text: string;
+    };
 };
 interface IMetadataBadgeProps {
     type: keyof typeof badgeTypeToDetails;
@@ -83,9 +79,8 @@ export declare const VersionBranch: ({ branch }: IVersionBranchProps) => JSX.Ele
 interface IVersionBuildProps {
     build: {
         buildNumber?: string;
-        buildLink?: string;
         version?: string;
-    };
+    } & Partial<LifecycleEventSummary>;
     withPrefix?: boolean;
 }
 export declare const VersionBuild: ({ build, withPrefix }: IVersionBuildProps) => JSX.Element;
@@ -96,6 +91,10 @@ export declare const VersionBuilds: ({ builds }: IVersionBuildsProps) => JSX.Ele
 export declare const BaseVersionMetadata: React.FC;
 interface ILifecycleEventDetailsProps extends Partial<LifecycleEventSummary> {
     title: string;
+    showLink?: boolean;
+    version?: string;
 }
-export declare const LifecycleEventDetails: ({ duration, link, startedAt, title }: ILifecycleEventDetailsProps) => JSX.Element;
+export declare const LifecycleEventDetails: ({ version, duration, link, startedAt, title, showLink, }: ILifecycleEventDetailsProps) => JSX.Element;
+declare type IDeploymentStatusProps = Pick<IVersionMetadataProps, 'deployedAt' | 'isPending' | 'isCurrent' | 'isDeploying'>;
+export declare const DeploymentStatus: ({ deployedAt, isCurrent, isPending, isDeploying }: IDeploymentStatusProps) => JSX.Element;
 export {};

package/dist/managed/versionMetadata/VersionMetadata.d.ts

@@ -2,5 +2,9 @@
 import type { IVersionMetadataProps } from './MetadataComponents';
 import type { QueryArtifactVersion } from '../overview/types';
 import type { SingleVersionArtifactVersion } from '../versionsHistory/types';
-export declare const getBaseMetadata: (version: QueryArtifactVersion | SingleVersionArtifactVersion) => Omit<Partial<IVersionMetadataProps>, 'version'> & Pick<IVersionMetadataProps, 'version'>;
-export declare const VersionMetadata: ({ version, sha, build, author, deployedAt, createdAt, buildsBehind, bake, isDeploying, pinned, vetoed, actions, }: IVersionMetadataProps) => JSX.Element;
+export declare const getVersionCompareLinks: (version: QueryArtifactVersion | SingleVersionArtifactVersion) => {
+    current: string;
+    previous: string;
+};
+export declare const getBaseMetadata: (version: QueryArtifactVersion | SingleVersionArtifactVersion) => Partial<IVersionMetadataProps>;
+export declare const VersionMetadata: ({ build, author, deployedAt, isPending, isCurrent, isDeploying, buildsBehind, bake, pinned, vetoed, }: IVersionMetadataProps) => JSX.Element;

package/dist/search/infrastructure/infrastructureSearch.service.d.ts

@@ -11,8 +11,9 @@ export interface ISearchResultSet<T extends ISearchResult = ISearchResult> {
     error?: any;
     query?: string;
 }
+export declare type ISearchResultFormatter = (entry: ISearchResult, fromRoute?: boolean) => string | PromiseLike<string>;
 export interface IProviderResultFormatter {
-    [category: string]: (entry: ISearchResult, fromRoute?: boolean) => string;
+    [category: string]: ISearchResultFormatter;
 }
 export declare class InfrastructureSearcher {
     private $q;

package/dist/securityGroup/index.d.ts

@@ -1,3 +1,4 @@
-export * from './securityGroupReader.service';
 export * from './SecurityGroupWriter';
 export * from './label/FirewallLabels';
+export * from './securityGroupReader.service';
+export * from './securityGroupSearchResultType';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@spinnaker/core",
   "license": "Apache-2.0",
-  "version": "0.14.1",
+  "version": "0.16.0",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
@@ -25,7 +25,6 @@
     "@uirouter/react-hybrid": "1.0.2",
     "@uirouter/rx": "0.6.5",
     "@uirouter/visualizer": "7.2.1",
-    "Select2": "git://github.com/select2/select2.git#3.4.8",
     "angular": "1.6.10",
     "angular-messages": "1.6.10",
     "angular-sanitize": "1.6.10",
@@ -77,7 +76,8 @@
     "react2angular": "3.2.1",
     "recoil": "0.0.10",
     "rxjs": "6.6.7",
-    "select2-bootstrap-css": "git://github.com/t0m/select2-bootstrap-css.git#v1.3.1",
+    "select2": "3.5.1",
+    "select2-bootstrap-css": "1.4.6",
     "source-sans": "3.46.0",
     "spel2js": "0.2.6",
     "ui-select": "0.19.8"
@@ -88,8 +88,8 @@
     "@graphql-codegen/typescript": "^1.22.4",
     "@graphql-codegen/typescript-operations": "^1.18.3",
     "@graphql-codegen/typescript-react-apollo": "^2.3.0",
-    "@spinnaker/eslint-plugin": "^3.0.0",
-    "@spinnaker/scripts": "^0.2.2",
+    "@spinnaker/eslint-plugin": "^3.0.1",
+    "@spinnaker/scripts": "^0.2.4",
     "@types/angular": "1.6.26",
     "@types/angular-mocks": "1.5.10",
     "@types/angular-ui-bootstrap": "0.13.41",
@@ -120,5 +120,5 @@
     "shx": "0.3.3",
     "typescript": "4.3.5"
   },
-  "gitHead": "b36e5fa30e23cd60007e6839b0dab5e41bd410d5"
+  "gitHead": "59026ea6af7b81ffb8e8c59e18f43396906ddafb"
 }

package/src/account/AccountSelectInput.spec.tsx

@@ -1,8 +1,13 @@
+import type { IScope } from 'angular';
+import { mock } from 'angular';
+import type { ShallowWrapper } from 'enzyme';
+import { shallow } from 'enzyme';
 import React from 'react';
-import { ShallowWrapper, shallow } from 'enzyme';
-import { IScope, mock } from 'angular';
-import { AccountService, IAccountDetails } from './AccountService';
-import { AccountSelectInput, IAccountSelectInputProps, IAccountSelectInputState } from './AccountSelectInput';
+
+import type { IAccountSelectInputProps, IAccountSelectInputState } from './AccountSelectInput';
+import { AccountSelectInput } from './AccountSelectInput';
+import type { IAccountDetails } from './AccountService';
+import { AccountService } from './AccountService';
 import Spy = jasmine.Spy;
 
 const makeAccount = (name: string, cloudProvider: string, primaryAccount: boolean): IAccountDetails => {

package/src/account/AccountService.spec.ts

@@ -1,12 +1,12 @@
 import { mock } from 'angular';
-import { mockHttpClient } from '../api/mock/jasmine';
-import { MockHttpClient } from '../api/mock/mockHttpClient';
-
-import { SETTINGS } from '../config/settings';
 import { $rootScope } from 'ngimport';
-import { CloudProviderRegistry } from '../cloudProvider';
 
-import { AccountService, IAccount } from './AccountService';
+import type { IAccount } from './AccountService';
+import { AccountService } from './AccountService';
+import { mockHttpClient } from '../api/mock/jasmine';
+import type { MockHttpClient } from '../api/mock/mockHttpClient';
+import { CloudProviderRegistry } from '../cloudProvider';
+import { SETTINGS } from '../config/settings';
 
 function flush<T>(http: MockHttpClient, promise: PromiseLike<T>): Promise<T> {
   return http

package/src/api/ApiService.spec.ts

@@ -1,6 +1,6 @@
-import { IHttpClientImplementation } from './ApiService';
-import { SETTINGS } from '../config/settings';
+import type { IHttpClientImplementation } from './ApiService';
 import { makeRequestBuilderConfig, RequestBuilder } from './ApiService';
+import { SETTINGS } from '../config/settings';
 
 describe('RequestBuilder backend', () => {
   const createBackend = (): IHttpClientImplementation => jasmine.createSpyObj(['get', 'post', 'put', 'delete']);

package/src/api/ApiServiceDeprecated.spec.ts

@@ -1,8 +1,11 @@
+/* eslint-disable @spinnaker/api-deprecation, @spinnaker/api-no-slashes, @spinnaker/migrate-to-mock-http-client */
+
 import Spy = jasmine.Spy;
 import { mock, noop } from 'angular';
-import { AuthenticationInitializer } from '../authentication/AuthenticationInitializer';
-import { ICache } from '../cache';
+
 import { API, InvalidAPIResponse, invalidContentMessage } from './ApiService';
+import { AuthenticationInitializer } from '../authentication/AuthenticationInitializer';
+import type { ICache } from '../cache';
 import { SETTINGS } from '../config/settings';
 
 describe('API Service', function () {

package/src/application/application.model.spec.ts

@@ -1,14 +1,13 @@
 import { mock } from 'angular';
 
-import { Application } from './application.model';
+import type { Application } from './application.model';
 import { ApplicationModelBuilder } from './applicationModel.builder';
-import { ApplicationDataSourceRegistry } from './service/ApplicationDataSourceRegistry';
+import type { IEntityTag, IEntityTags, IInstanceCounts, ILoadBalancer, IServerGroup } from '../domain';
 import { LOAD_BALANCER_DATA_SOURCE } from '../loadBalancer/loadBalancer.dataSource';
-import { SecurityGroupReader } from '../securityGroup/securityGroupReader.service';
-import { SERVER_GROUP_DATA_SOURCE } from '../serverGroup/serverGroup.dataSource';
 import { SECURITY_GROUP_DATA_SOURCE } from '../securityGroup/securityGroup.dataSource';
-
-import { IEntityTag, IEntityTags, IServerGroup, IInstanceCounts, ILoadBalancer } from '../domain';
+import type { SecurityGroupReader } from '../securityGroup/securityGroupReader.service';
+import { SERVER_GROUP_DATA_SOURCE } from '../serverGroup/serverGroup.dataSource';
+import { ApplicationDataSourceRegistry } from './service/ApplicationDataSourceRegistry';
 
 describe('Application Model', function () {
   let application: Application,
@@ -187,19 +186,19 @@ describe('Application Model', function () {
   describe('setting default credentials and regions', function () {
     it('sets default credentials and region from server group when only one account/region found', function () {
       const serverGroups: IServerGroup[] = [
-          {
-            name: 'deck-test-v001',
-            cluster: 'deck-test',
-            account: 'test',
-            region: 'us-west-2',
-            type: 'aws',
-            cloudProvider: 'aws',
-            instances: [],
-            instanceCounts: {} as IInstanceCounts,
-          },
-        ],
-        loadBalancers: ILoadBalancer[] = [],
-        securityGroupsByApplicationName: any[] = [];
+        {
+          name: 'deck-test-v001',
+          cluster: 'deck-test',
+          account: 'test',
+          region: 'us-west-2',
+          type: 'aws',
+          cloudProvider: 'aws',
+          instances: [],
+          instanceCounts: {} as IInstanceCounts,
+        },
+      ];
+      const loadBalancers: ILoadBalancer[] = [];
+      const securityGroupsByApplicationName: any[] = [];
 
       configureApplication(serverGroups, loadBalancers, securityGroupsByApplicationName);
       expect(application.defaultCredentials.aws).toBe('test');
@@ -207,11 +206,11 @@ describe('Application Model', function () {
     });
 
     it('sets default credentials and region from load balancer when only one account/region found', function () {
-      const serverGroups: IServerGroup[] = [],
-        loadBalancers: ILoadBalancer[] = [
-          { name: 'deck-frontend', cloudProvider: 'gce', vpcId: 'vpc0', region: 'us-central-1', account: 'prod' },
-        ],
-        securityGroupsByApplicationName: any[] = [];
+      const serverGroups: IServerGroup[] = [];
+      const loadBalancers: ILoadBalancer[] = [
+        { name: 'deck-frontend', cloudProvider: 'gce', vpcId: 'vpc0', region: 'us-central-1', account: 'prod' },
+      ];
+      const securityGroupsByApplicationName: any[] = [];
 
       configureApplication(serverGroups, loadBalancers, securityGroupsByApplicationName);
       expect(application.defaultCredentials.gce).toBe('prod');
@@ -219,11 +218,11 @@ describe('Application Model', function () {
     });
 
     it('sets default credentials and region from firewall', function () {
-      const serverGroups: any[] = [],
-        loadBalancers: ILoadBalancer[] = [],
-        securityGroupsByApplicationName: any[] = [
-          { name: 'deck-test', provider: 'cf', accountName: 'test', region: 'us-south-7' },
-        ];
+      const serverGroups: any[] = [];
+      const loadBalancers: ILoadBalancer[] = [];
+      const securityGroupsByApplicationName: any[] = [
+        { name: 'deck-test', provider: 'cf', accountName: 'test', region: 'us-south-7' },
+      ];
 
       configureApplication(serverGroups, loadBalancers, securityGroupsByApplicationName);
       expect(application.defaultCredentials.cf).toBe('test');
@@ -231,13 +230,13 @@ describe('Application Model', function () {
     });
 
     it('does not set defaults when multiple values found for the same provider', function () {
-      const serverGroups: IServerGroup[] = [],
-        loadBalancers: ILoadBalancer[] = [
-          { name: 'deck-frontend', cloudProvider: 'aws', vpcId: 'vpcId', region: 'us-west-1', account: 'prod' },
-        ],
-        securityGroupsByApplicationName: any[] = [
-          { name: 'deck-test', provider: 'aws', accountName: 'test', region: 'us-east-1' },
-        ];
+      const serverGroups: IServerGroup[] = [];
+      const loadBalancers: ILoadBalancer[] = [
+        { name: 'deck-frontend', cloudProvider: 'aws', vpcId: 'vpcId', region: 'us-west-1', account: 'prod' },
+      ];
+      const securityGroupsByApplicationName: any[] = [
+        { name: 'deck-test', provider: 'aws', accountName: 'test', region: 'us-east-1' },
+      ];
 
       configureApplication(serverGroups, loadBalancers, securityGroupsByApplicationName);
       expect(application.defaultCredentials.aws).toBeUndefined();
@@ -245,13 +244,13 @@ describe('Application Model', function () {
     });
 
     it('sets default region or default credentials if possible', function () {
-      const serverGroups: IServerGroup[] = [],
-        loadBalancers: ILoadBalancer[] = [
-          { name: 'deck-frontend', cloudProvider: 'aws', vpcId: 'vpcId', region: 'us-east-1', account: 'prod' },
-        ],
-        securityGroupsByApplicationName: any[] = [
-          { name: 'deck-test', provider: 'aws', accountName: 'test', region: 'us-east-1' },
-        ];
+      const serverGroups: IServerGroup[] = [];
+      const loadBalancers: ILoadBalancer[] = [
+        { name: 'deck-frontend', cloudProvider: 'aws', vpcId: 'vpcId', region: 'us-east-1', account: 'prod' },
+      ];
+      const securityGroupsByApplicationName: any[] = [
+        { name: 'deck-test', provider: 'aws', accountName: 'test', region: 'us-east-1' },
+      ];
 
       configureApplication(serverGroups, loadBalancers, securityGroupsByApplicationName);
       expect(application.defaultCredentials.aws).toBeUndefined();
@@ -259,13 +258,13 @@ describe('Application Model', function () {
     });
 
     it('sets default credentials, even if region cannot be set', function () {
-      const serverGroups: IServerGroup[] = [],
-        loadBalancers: ILoadBalancer[] = [
-          { name: 'deck-frontend', cloudProvider: 'aws', vpcId: 'vpc0', region: 'us-east-1', account: 'test' },
-        ],
-        securityGroupsByApplicationName: any[] = [
-          { name: 'deck-test', provider: 'aws', accountName: 'test', region: 'us-west-1' },
-        ];
+      const serverGroups: IServerGroup[] = [];
+      const loadBalancers: ILoadBalancer[] = [
+        { name: 'deck-frontend', cloudProvider: 'aws', vpcId: 'vpc0', region: 'us-east-1', account: 'test' },
+      ];
+      const securityGroupsByApplicationName: any[] = [
+        { name: 'deck-test', provider: 'aws', accountName: 'test', region: 'us-west-1' },
+      ];
 
       configureApplication(serverGroups, loadBalancers, securityGroupsByApplicationName);
       expect(application.defaultCredentials.aws).toBe('test');
@@ -274,35 +273,35 @@ describe('Application Model', function () {
 
     it('should set defaults for multiple providers', function () {
       const serverGroups: any[] = [
-          {
-            name: 'deck-test-v001',
-            account: 'test',
-            region: 'us-west-2',
-            provider: 'aws',
-            instances: [],
-            instanceCounts: { up: 0, down: 0, starting: 0, unknown: 0, outOfService: 0 },
-          },
-          {
-            name: 'deck-gce-v001',
-            account: 'gce-test',
-            region: 'us-central-1',
-            provider: 'gce',
-            instances: [],
-            instanceCounts: { up: 0, down: 0, starting: 0, unknown: 0, outOfService: 0 },
-          },
-        ],
-        loadBalancers: ILoadBalancer[] = [
-          {
-            name: 'deck-frontend',
-            account: 'gce-test',
-            cloudProvider: 'gce',
-            region: 'us-central-1',
-            serverGroups: [],
-          },
-        ],
-        securityGroupsByApplicationName: any[] = [
-          { name: 'deck-test', provider: 'aws', accountName: 'test', region: 'us-west-2' },
-        ];
+        {
+          name: 'deck-test-v001',
+          account: 'test',
+          region: 'us-west-2',
+          provider: 'aws',
+          instances: [],
+          instanceCounts: { up: 0, down: 0, starting: 0, unknown: 0, outOfService: 0 },
+        },
+        {
+          name: 'deck-gce-v001',
+          account: 'gce-test',
+          region: 'us-central-1',
+          provider: 'gce',
+          instances: [],
+          instanceCounts: { up: 0, down: 0, starting: 0, unknown: 0, outOfService: 0 },
+        },
+      ];
+      const loadBalancers: ILoadBalancer[] = [
+        {
+          name: 'deck-frontend',
+          account: 'gce-test',
+          cloudProvider: 'gce',
+          region: 'us-central-1',
+          serverGroups: [],
+        },
+      ];
+      const securityGroupsByApplicationName: any[] = [
+        { name: 'deck-test', provider: 'aws', accountName: 'test', region: 'us-west-2' },
+      ];
 
       configureApplication(serverGroups, loadBalancers, securityGroupsByApplicationName);
       expect(application.defaultCredentials.aws).toBe('test');

package/src/application/applications.state.provider.ts

@@ -13,7 +13,7 @@ module(APPLICATIONS_STATE_PROVIDER, [STATE_CONFIG_PROVIDER, APPLICATION_STATE_PR
   (stateConfigProvider: StateConfigProvider, applicationStateProvider: ApplicationStateProvider) => {
     const applicationsState: INestedState = {
       name: 'applications',
-      url: '/applications',
+      url: '/applications?create',
       views: {
         'main@': {
           component: Applications,

package/src/application/config/applicationAttributes.directive.html

@@ -1,4 +1,4 @@
-<dl class="dl-horizontal">
+<dl class="dl-horizontal" ng-if="(config.application.attributes && config.application.attributes.email)">
   <dt>Owner</dt>
   <dd>{{vm.application.attributes.email}}</dd>
   <dt ng-if="vm.application.attributes.appGroup">App Group <help-field key="application.group"></help-field></dt>
@@ -55,7 +55,11 @@
     <dd>{{vm.permissions}}</dd>
   </render-if-feature>
 </dl>
+<p ng-if="(!config.application.attributes || !config.application.attributes.email)">
+  This application has not been configured.
+</p>
 <button class="btn btn-link" ng-click="vm.editApplication()">
   <span class="glyphicon glyphicon-cog"></span>
-  Edit Application Attributes
+  {{ (!config.application.attributes || !config.application.attributes.email) ? "Create Application" : "Edit Application
+  Attributes"}}
 </button>

package/src/application/config/applicationAttributes.directive.js

@@ -110,6 +110,10 @@ module(CORE_APPLICATION_CONFIG_APPLICATIONATTRIBUTES_DIRECTIVE, [
           .catch(() => {});
       };
 
+      if (this.application && (!this.application.attributes || !this.application.attributes.email)) {
+        this.editApplication();
+      }
+
       this.slackBaseUrl = get(SETTINGS, 'slack.baseUrl', '');
     },
   ]);

package/src/application/config/applicationConfig.view.html

@@ -1,5 +1,18 @@
 <div style="overflow-y: auto" sticky-headers>
-  <page-navigator scrollable-container="[sticky-headers]" deep-link-param="section">
+  <page-navigator
+    scrollable-container="[sticky-headers]"
+    deep-link-param="section"
+    ng-if="(!config.application.attributes || !config.application.attributes.email)"
+  >
+    <page-section key="location" label="Application Attributes">
+      <application-attributes application="config.application"></application-attributes>
+    </page-section>
+  </page-navigator>
+  <page-navigator
+    scrollable-container="[sticky-headers]"
+    deep-link-param="section"
+    ng-if="(config.application.attributes && config.application.attributes.email)"
+  >
     <page-section key="location" label="Application Attributes">
       <application-attributes application="config.application"></application-attributes>
     </page-section>

package/src/application/config/customBanner/CustomBannerConfig.spec.tsx

@@ -1,10 +1,10 @@
-import React from 'react';
 import { shallow } from 'enzyme';
+import React from 'react';
 
+import type { ICustomBannerConfig } from './CustomBannerConfig';
+import { CustomBannerConfig } from './CustomBannerConfig';
 import { noop } from '../../../utils';
 
-import { CustomBannerConfig, ICustomBannerConfig } from './CustomBannerConfig';
-
 describe('<CustomBannerConfig />', () => {
   let bannerConfigs: ICustomBannerConfig[];
   let wrapper: any;

package/src/application/config/dataSources/applicationDataSourceEditor.component.spec.ts

@@ -1,10 +1,11 @@
 import { mock } from 'angular';
 
-import { Application } from '../../application.model';
+import type { Application } from '../../application.model';
+import type { DataSourceEditorController } from './applicationDataSourceEditor.component';
+import { APPLICATION_DATA_SOURCE_EDITOR } from './applicationDataSourceEditor.component';
 import { ApplicationModelBuilder } from '../../applicationModel.builder';
-import { APPLICATION_DATA_SOURCE_EDITOR, DataSourceEditorController } from './applicationDataSourceEditor.component';
-import { ApplicationWriter } from '../../service/ApplicationWriter';
 import { TaskReader } from '../../../index';
+import { ApplicationWriter } from '../../service/ApplicationWriter';
 
 describe('Component: Application Data Source Editor', () => {
   let application: Application,

package/src/application/config/footer/configSectionFooter.component.spec.ts

@@ -1,7 +1,8 @@
 import { mock } from 'angular';
 
+import type { ConfigSectionFooterController } from './configSectionFooter.component';
+import { CONFIG_SECTION_FOOTER } from './configSectionFooter.component';
 import { ApplicationWriter } from '../../service/ApplicationWriter';
-import { CONFIG_SECTION_FOOTER, ConfigSectionFooterController } from './configSectionFooter.component';
 
 describe('Component: ConfigSectionFooter', () => {
   let $componentController: ng.IComponentControllerService,

package/src/application/listExtractor/AppListExtractor.spec.ts

@@ -1,8 +1,8 @@
-import { IInstance, IServerGroup } from '../../domain';
-import { Application } from '../application.model';
-import { ApplicationModelBuilder } from '../applicationModel.builder';
 import { AppListExtractor } from './AppListExtractor';
-import { IMoniker } from '../../naming/IMoniker';
+import type { Application } from '../application.model';
+import { ApplicationModelBuilder } from '../applicationModel.builder';
+import type { IInstance, IServerGroup } from '../../domain';
+import type { IMoniker } from '../../naming/IMoniker';
 
 describe('AppListExtractor', function () {
   const buildApplication = (serverGroups: any[] = []): Application => {

package/src/application/modal/PermissionsConfigurer.spec.tsx

@@ -1,10 +1,11 @@
-import React from 'react';
 import { mock } from 'angular';
 import { mount } from 'enzyme';
+import React from 'react';
 
+import type { IPermissions, IPermissionsConfigurerProps } from './PermissionsConfigurer';
+import { PermissionsConfigurer } from './PermissionsConfigurer';
 import { AuthenticationService } from '../../authentication';
 import { REACT_MODULE } from '../../reactShims';
-import { IPermissions, IPermissionsConfigurerProps, PermissionsConfigurer } from './PermissionsConfigurer';
 
 describe('PermissionsConfigurer', () => {
   const createComponent = (props: IPermissionsConfigurerProps) => {

package/src/application/modal/createApplication.modal.controller.js

@@ -30,7 +30,8 @@ module(CORE_APPLICATION_MODAL_CREATEAPPLICATION_MODAL_CONTROLLER, [
   '$state',
   '$uibModalInstance',
   '$timeout',
-  function ($scope, $q, $log, $state, $uibModalInstance, $timeout) {
+  'name',
+  function ($scope, $q, $log, $state, $uibModalInstance, $timeout, name) {
     const applicationLoader = ApplicationReader.listApplications();
     applicationLoader.then((applications) => (this.data.appNameList = _.map(applications, 'name')));
 
@@ -59,6 +60,10 @@ module(CORE_APPLICATION_MODAL_CREATEAPPLICATION_MODAL_CONTROLLER, [
       instancePort: SETTINGS.defaultInstancePort || null,
     };
 
+    if (name) {
+      this.application.name = name;
+    }
+
     const submitting = () => {
       this.state.errorMessages = [];
       this.state.submitting = true;
@@ -71,11 +76,7 @@ module(CORE_APPLICATION_MODAL_CREATEAPPLICATION_MODAL_CONTROLLER, [
     let navigateTimeout = null;
 
     const routeToApplication = () => {
-      navigateTimeout = $timeout(() => {
-        $state.go('home.applications.application', {
-          application: this.application.name,
-        });
-      }, 1000);
+      $uibModalInstance.close(this.application);
     };
 
     $scope.$on('$destroy', () => $timeout.cancel(navigateTimeout));

package/src/application/modal/createApplication.modal.controller.spec.js

@@ -14,6 +14,7 @@ describe('Controller: CreateApplicationModalCtrl', function () {
       controller = $controller('CreateApplicationModalCtrl', {
         $scope: scope,
         $uibModalInstance: {},
+        name: 'deck',
       });
     }),
   );

package/src/application/modal/editApplication.controller.modal.js

@@ -32,6 +32,7 @@ angular
       };
       vm.errorMsgs = [];
       vm.application = application;
+      vm.isNew = !application.attributes || !application.attributes.email;
       vm.applicationAttributes = _.cloneDeep(application.attributes);
 
       AccountService.listProviders().then((providers) => (vm.data.cloudProviders = providers));

package/src/application/modal/editApplication.html

@@ -1,7 +1,7 @@
 <div class="modal-page">
   <modal-close dismiss="$dismiss()"></modal-close>
   <div class="modal-header">
-    <h4 class="modal-title">Edit Application</h4>
+    <h4 class="modal-title">{{editApp.isNew ? "Create" : "Edit"}} Application</h4>
   </div>
 
   <form role="form" class="container-fluid" novalidate name="editApplicationForm">
@@ -252,7 +252,7 @@
     <div class="modal-footer">
       <a href class="btn btn-default" ng-click="$dismiss()">Cancel</a>
       <submit-button
-        is-new="false"
+        is-new="editApp.isNew"
         is-disabled="!editApplicationForm.$valid || editApp.state.submitting || editApp.data.showOverrideWarning || editApp.state.permissionsInvalid"
         submitting="editApp.state.submitting"
         on-click="editApp.submit()"