@spinnaker/core 0.15.1 → 0.16.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@spinnaker/core",
   "license": "Apache-2.0",
-  "version": "0.15.1",
+  "version": "0.16.0",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
@@ -89,7 +89,7 @@
     "@graphql-codegen/typescript-operations": "^1.18.3",
     "@graphql-codegen/typescript-react-apollo": "^2.3.0",
     "@spinnaker/eslint-plugin": "^3.0.1",
-    "@spinnaker/scripts": "^0.2.3",
+    "@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": "187272ef1933753688fb8f7966e250a27104612a"
+  "gitHead": "59026ea6af7b81ffb8e8c59e18f43396906ddafb"
 }

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/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/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/insight/InsightMenu.tsx

@@ -56,6 +56,9 @@ export class InsightMenu extends React.Component<IInsightMenuProps, IInsightMenu
           'createApplicationModal',
           require('../application/modal/newapplication.html'),
         ),
+        resolve: {
+          name: () => '',
+        },
         controller: this.overrideRegistry.getController('CreateApplicationModalCtrl'),
         controllerAs: 'newAppModal',
       })

package/src/search/infrastructure/infrastructure.controller.js

@@ -136,6 +136,9 @@ angular
               'createApplicationModal',
               require('../../application/modal/newapplication.html'),
             ),
+            resolve: {
+              name: () => '',
+            },
             controller: overrideRegistry.getController('CreateApplicationModalCtrl'),
             controllerAs: 'newAppModal',
           })