feat(core/build): Remove ng2 hybrid app

spinnaker · Feb 24, 2017 · 0f36a81 · 0f36a81
1 parent 64d46ed
commit 0f36a81
Show file tree

Hide file tree

Showing 76 changed files with 104 additions and 177 deletions.
diff --git a/app/index.deck b/app/index.deck
@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="no-js">
+<html class="no-js" ng-app="netflix.spinnaker">
 <head>
   <title ng-bind="pageTitle">Spinnaker</title>
   <meta charset="utf-8">

diff --git a/app/scripts/app.js b/app/scripts/app.js
@@ -0,0 +1,24 @@
+'use strict';
+
+// deck is reliant on a million jquery features; we need to load it before angular so that angular does not
+// try to use its jqLite implementation.
+
+window.$ = window.jQuery = require('jquery');
+
+let angular = require('angular');
+
+import {APPENGINE_MODULE} from './modules/appengine/appengine.module';
+
+module.exports = angular.module('netflix.spinnaker', [
+  require('./modules/netflix/netflix.module'),
+  require('./modules/core/core.module'),
+  require('./modules/amazon/aws.module'),
+  require('./modules/google/gce.module'),
+  require('./modules/cloudfoundry/cf.module'),
+  require('./modules/titus/titus.module'),
+  require('./modules/azure/azure.module'),
+  require('./modules/kubernetes/kubernetes.module'),
+  require('./modules/openstack/openstack.module'),
+  require('./modules/docker/docker.module'),
+  APPENGINE_MODULE,
+]);
diff --git a/app/scripts/app.ts b/app/scripts/app.ts
diff --git a/...ipts/modules/amazon/serverGroup/configure/wizard/templateSelection/templateSelection.html b/...ipts/modules/amazon/serverGroup/configure/wizard/templateSelection/templateSelection.html
@@ -1,5 +1,5 @@
 <div modal-page ng-controller="awsDeployInitializerCtrl as deployInitializerCtrl">
-  <modal-close (dismiss)="$dismiss()"></modal-close>
+  <modal-close dismiss="$dismiss()"></modal-close>
   <div ng-if="state.loaded">
     <div class="modal-header">
       <h3>Template Selection</h3>

diff --git a/...ts/modules/amazon/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.html b/...ts/modules/amazon/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.html
@@ -1,7 +1,7 @@
 <div modal-page>
   <task-monitor monitor="taskMonitor"></task-monitor>
   <form role="form" name="form">
-    <modal-close (dismiss)="$dismiss()"></modal-close>
+    <modal-close dismiss="$dismiss()"></modal-close>
     <div class="modal-header">
       <h3>Edit Advanced Settings for {{serverGroup.name}}</h3>
     </div>

diff --git a/app/scripts/modules/amazon/serverGroup/details/resize/resizeServerGroup.html b/app/scripts/modules/amazon/serverGroup/details/resize/resizeServerGroup.html
@@ -1,7 +1,7 @@
 <div modal-page class="confirmation-modal">
   <task-monitor monitor="taskMonitor"></task-monitor>
   <form role="form">
-    <modal-close (dismiss)="$dismiss()"></modal-close>
+    <modal-close dismiss="$dismiss()"></modal-close>
     <div class="modal-header">
       <h3>Resize {{serverGroup.name}}</h3>
     </div>

diff --git a/app/scripts/modules/amazon/serverGroup/details/rollback/rollbackServerGroup.html b/app/scripts/modules/amazon/serverGroup/details/rollback/rollbackServerGroup.html
@@ -1,7 +1,7 @@
 <div modal-page class="confirmation-modal">
   <task-monitor monitor="taskMonitor"></task-monitor>
   <form role="form">
-    <modal-close (dismiss)="$dismiss()"></modal-close>
+    <modal-close dismiss="$dismiss()"></modal-close>
     <div class="modal-header">
       <h3>Rollback {{serverGroup.name}}</h3>
     </div>

diff --git a/...ts/modules/amazon/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.modal.html b/...ts/modules/amazon/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.modal.html
@@ -1,6 +1,6 @@
 <div modal-page class="scaling-policy-modal form-inline">
   <task-monitor monitor="ctrl.taskMonitor"></task-monitor>
-  <modal-close (dismiss)="$dismiss()"></modal-close>
+  <modal-close dismiss="$dismiss()"></modal-close>
   <div class="modal-header">
     <h3>{{ctrl.action}} scaling policy</h3>
   </div>

diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingProcesses/modifyScalingProcesses.html b/app/scripts/modules/amazon/serverGroup/details/scalingProcesses/modifyScalingProcesses.html
@@ -1,7 +1,7 @@
 <div modal-page class="confirmation-modal">
   <task-monitor monitor="taskMonitor"></task-monitor>
   <form role="form">
-    <modal-close (dismiss)="$dismiss()"></modal-close>
+    <modal-close dismiss="$dismiss()"></modal-close>
     <div class="modal-header">
       <h3>Modify Scaling Processes for {{serverGroup.name}}</h3>
     </div>

diff --git a/...cripts/modules/amazon/serverGroup/details/scheduledAction/editScheduledActions.modal.html b/...cripts/modules/amazon/serverGroup/details/scheduledAction/editScheduledActions.modal.html
@@ -1,7 +1,7 @@
 <div modal-page>
   <task-monitor monitor="taskMonitor"></task-monitor>
   <form role="form" name="form">
-    <modal-close (dismiss)="$dismiss()"></modal-close>
+    <modal-close dismiss="$dismiss()"></modal-close>
     <div class="modal-header">
       <h3>Edit Scheduled Actions for {{serverGroup.name}}</h3>
     </div>

diff --git a/app/scripts/modules/amazon/serverGroup/details/securityGroup/editSecurityGroups.modal.html b/app/scripts/modules/amazon/serverGroup/details/securityGroup/editSecurityGroups.modal.html
@@ -1,7 +1,7 @@
 <div modal-page>
   <task-monitor monitor="$ctrl.taskMonitor"></task-monitor>
   <form role="form" name="form">
-    <modal-close (dismiss)="$dismiss()"></modal-close>
+    <modal-close dismiss="$dismiss()"></modal-close>
     <div class="modal-header">
       <h3>Edit Security Groups for {{$ctrl.serverGroup.name}}</h3>
     </div>

diff --git a/app/scripts/modules/appengine/pipeline/stages/editLoadBalancer/loadBalancerChoice.modal.html b/app/scripts/modules/appengine/pipeline/stages/editLoadBalancer/loadBalancerChoice.modal.html
@@ -1,5 +1,5 @@
 <div modal-page>
-  <modal-close (dismiss)="$dismiss()"></modal-close>
+  <modal-close dismiss="$dismiss()"></modal-close>
   <div class="modal-header">
     <h3>Select Load Balancer</h3>
   </div>

diff --git a/app/scripts/modules/azure/serverGroup/configure/wizard/templateSelection.html b/app/scripts/modules/azure/serverGroup/configure/wizard/templateSelection.html
@@ -1,5 +1,5 @@
 <div modal-page ng-controller="azureDeployInitializerCtrl as deployInitializerCtrl">
-  <modal-close (dismiss)="$dismiss()"></modal-close>
+  <modal-close dismiss="$dismiss()"></modal-close>
   <div ng-if="state.loaded">
     <div class="modal-header">
       <h3>Template Selection</h3>

diff --git a/app/scripts/modules/cloudfoundry/serverGroup/configure/wizard/templateSelection.html b/app/scripts/modules/cloudfoundry/serverGroup/configure/wizard/templateSelection.html
@@ -1,5 +1,5 @@
 <div modal-page ng-controller="cfDeployInitializerCtrl as deployInitializerCtrl">
-  <modal-close (dismiss)="$dismiss()"></modal-close>
+  <modal-close dismiss="$dismiss()"></modal-close>
   <div ng-if="state.loaded">
     <div class="modal-header">
       <h3>Template Selection</h3>

diff --git a/app/scripts/modules/cloudfoundry/serverGroup/details/resize/resizeServerGroup.html b/app/scripts/modules/cloudfoundry/serverGroup/details/resize/resizeServerGroup.html
@@ -1,7 +1,7 @@
 <div modal-page>
   <task-monitor monitor="taskMonitor"></task-monitor>
   <form role="form">
-    <modal-close (dismiss)="$dismiss()"></modal-close>
+    <modal-close dismiss="$dismiss()"></modal-close>
     <div class="modal-header">
       <h3>Resize {{serverGroup.name}}</h3>
     </div>

diff --git a/app/scripts/modules/cloudfoundry/serverGroup/details/rollback/rollbackServerGroup.html b/app/scripts/modules/cloudfoundry/serverGroup/details/rollback/rollbackServerGroup.html
@@ -1,7 +1,7 @@
 <div modal-page class="confirmation-modal">
   <task-monitor monitor="taskMonitor"></task-monitor>
   <form role="form" ng-if="!ctrl.submitting">
-    <modal-close (dismiss)="$dismiss()"></modal-close>
+    <modal-close dismiss="$dismiss()"></modal-close>
     <div class="modal-header">
       <h3>Rollback {{serverGroup.name}}</h3>
     </div>

diff --git a/app/scripts/modules/core/application/config/links/editLinks.modal.html b/app/scripts/modules/core/application/config/links/editLinks.modal.html
@@ -1,5 +1,5 @@
 <div modal-page class="flex-fill">
-  <modal-close (dismiss)="$dismiss()"></modal-close>
+  <modal-close dismiss="$dismiss()"></modal-close>
   <div class="modal-header">
     <h3>Edit Application Links</h3>
   </div>

diff --git a/app/scripts/modules/core/application/modal/editApplication.html b/app/scripts/modules/core/application/modal/editApplication.html
@@ -1,5 +1,5 @@
 <div class="modal-page">
-  <modal-close (dismiss)="$dismiss()"></modal-close>
+  <modal-close dismiss="$dismiss()"></modal-close>
   <div class="modal-header">
     <h3 data-purpose="modal-header">Edit Application</h3>
   </div>

diff --git a/app/scripts/modules/core/application/modal/newapplication.html b/app/scripts/modules/core/application/modal/newapplication.html
@@ -1,5 +1,5 @@
 <div class="modal-page">
-  <modal-close (dismiss)="$dismiss()"></modal-close>
+  <modal-close dismiss="$dismiss()"></modal-close>
   <div class="modal-header">
     <h3 data-purpose="modal-header">New Application</h3>
   </div>

diff --git a/app/scripts/modules/core/application/modal/pageApplicationOwner.html b/app/scripts/modules/core/application/modal/pageApplicationOwner.html
@@ -1,6 +1,6 @@
 <div modal-page>
   <task-monitor monitor="ctrl.taskMonitor"></task-monitor>
-  <modal-close (dismiss)="$dismiss()"></modal-close>
+  <modal-close dismiss="$dismiss()"></modal-close>
   <div class="modal-header">
     <h3 data-purpose="modal-header">Page {{ctrl.application.name}} Owner</h3>
   </div>

diff --git a/app/scripts/modules/core/authentication/authentication.service.ts b/app/scripts/modules/core/authentication/authentication.service.ts
@@ -1,14 +1,11 @@
-import {Injectable} from '@angular/core';
-
-import {IDowngradeItem} from 'core/domain/IDowngradeItem';
+import {module} from 'angular';
 
 export interface IUser {
   name: string;
   authenticated: boolean;
   lastAuthenticated?: number;
 }
 
-@Injectable()
 export class AuthenticationService {
 
   private user: IUser = {
@@ -42,8 +39,5 @@ export class AuthenticationService {
 }
 
 export const AUTHENTICATION_SERVICE = 'spinnaker.authentication.service';
-export const AUTHENTICATION_SERVICE_DOWNGRADE: IDowngradeItem = {
-  moduleName: AUTHENTICATION_SERVICE,
-  injectionName: 'authenticationService',
-  moduleClass: AuthenticationService
-};
+module(AUTHENTICATION_SERVICE, [])
+  .service('authenticationService', AuthenticationService);
diff --git a/app/scripts/modules/core/authentication/index.ts b/app/scripts/modules/core/authentication/index.ts
diff --git a/app/scripts/modules/core/confirmationModal/confirm.html b/app/scripts/modules/core/confirmationModal/confirm.html
@@ -2,7 +2,7 @@
   <form role="form" class="container-fluid no-padding" ng-submit="ctrl.confirm()">
     <task-monitor monitor="taskMonitor"></task-monitor>
     <multi-task-monitor ng-if="taskMonitors.length" monitors="taskMonitors" title="params.multiTaskTitle" close-modal="ctrl.cancel()"></multi-task-monitor>
-    <modal-close (dismiss)="$dismiss()"></modal-close>
+    <modal-close dismiss="$dismiss()"></modal-close>
     <div class="modal-header">
       <h3>{{params.header}}</h3>
     </div>

diff --git a/app/scripts/modules/core/delivery/create/createPipelineModal.html b/app/scripts/modules/core/delivery/create/createPipelineModal.html
@@ -1,5 +1,5 @@
 <div modal-page>
-  <modal-close (dismiss)="$dismiss()"></modal-close>
+  <modal-close dismiss="$dismiss()"></modal-close>
   <div class="modal-header">
     <h3>Create New {{command.strategy === true ?'Strategy':'Pipeline'}}</h3>
   </div>

diff --git a/app/scripts/modules/core/delivery/manualExecution/manualPipelineExecution.html b/app/scripts/modules/core/delivery/manualExecution/manualPipelineExecution.html
@@ -1,6 +1,6 @@
 <div modal-page>
   <task-monitor monitor="taskMonitor"></task-monitor>
-  <modal-close (dismiss)="$dismiss()"></modal-close>
+  <modal-close dismiss="$dismiss()"></modal-close>
   <div class="modal-header">
     <h3 ng-if="vm.command.pipeline && vm.triggers.length">Select Execution Parameters</h3>
     <h3 ng-if="vm.command.pipeline && !vm.triggers.length">Confirm Execution</h3>

diff --git a/app/scripts/modules/core/entityTag/entityTagEditor.modal.html b/app/scripts/modules/core/entityTag/entityTagEditor.modal.html
@@ -1,6 +1,6 @@
 <div modal-page class="entity-tag-editor-modal">
   <task-monitor monitor="$ctrl.taskMonitor"></task-monitor>
-  <modal-close (dismiss)="$ctrl.cancel()"></modal-close>
+  <modal-close dismiss="$ctrl.cancel()"></modal-close>
   <div class="modal-header">
     <h3>{{$ctrl.isNew ? 'Create' : 'Update'}} {{$ctrl.tag.value.type}}</h3>
   </div>

diff --git a/app/scripts/modules/core/index.ts b/app/scripts/modules/core/index.ts
diff --git a/app/scripts/modules/core/instance/details/console/consoleOutput.modal.html b/app/scripts/modules/core/instance/details/console/consoleOutput.modal.html
@@ -1,5 +1,5 @@
 <div modal-page>
-  <modal-close (dismiss)="$dismiss()"></modal-close>
+  <modal-close dismiss="$dismiss()"></modal-close>
   <div class="modal-header">
     <h3>Console Output: {{vm.instanceId}}</h3>
   </div>

diff --git a/app/scripts/modules/core/modal/buttons/index.ts b/app/scripts/modules/core/modal/buttons/index.ts
diff --git a/app/scripts/modules/core/modal/buttons/modalClose.component.ts b/app/scripts/modules/core/modal/buttons/modalClose.component.ts
@@ -1,31 +1,17 @@
-import {Component, Output, EventEmitter} from '@angular/core';
+import {module} from 'angular';
 
-import {IDowngradeItem} from 'core/domain/IDowngradeItem';
-@Component({
-  selector: 'deck-modal-close',
-  template: `
+class ModalCloseComponent implements ng.IComponentOptions {
+  public bindings: any = {
+    dismiss: '&'
+  };
+  public template = `
     <div class="close-button pull-right">
-      <a href class="btn btn-link" (click)="close($event)" >
+      <a href class="btn btn-link" ng-click="$ctrl.dismiss()" >
         <span class="glyphicon glyphicon-remove"></span>
       </a>
     </div>
-`
-})
-export class ModalCloseComponent {
-
-  @Output()
-  public dismiss = new EventEmitter();
-
-  public close($event: ng.IAngularEvent) {
-    $event.preventDefault();
-    this.dismiss.emit();
-  }
+`;
 }
 
 export const MODAL_CLOSE_COMPONENT = 'spinnaker.core.modal.modalClose.directive';
-export const MODAL_CLOSE_COMPONENT_DOWNGRADE: IDowngradeItem = {
-  moduleName: MODAL_CLOSE_COMPONENT,
-  injectionName: 'modalClose',
-  moduleClass: ModalCloseComponent,
-  outputs: ['dismiss']
-};
+module(MODAL_CLOSE_COMPONENT, []).component('modalClose', new ModalCloseComponent());
diff --git a/app/scripts/modules/core/modal/index.ts b/app/scripts/modules/core/modal/index.ts
diff --git a/app/scripts/modules/core/modal/wizard/v2modalWizard.component.html b/app/scripts/modules/core/modal/wizard/v2modalWizard.component.html
@@ -1,6 +1,6 @@
 <div modal-page>
   <task-monitor ng-if="$ctrl.taskMonitor" monitor="$ctrl.taskMonitor"></task-monitor>
-  <modal-close ng-if="!$ctrl.notReallyModal" (dismiss)="$ctrl.dismiss()"></modal-close>
+  <modal-close ng-if="!$ctrl.notReallyModal" dismiss="$ctrl.dismiss()"></modal-close>
   <div class="modal-header" ng-if="$ctrl.wizard.heading">
     <h3>{{$ctrl.wizard.heading}}</h3>
   </div>

diff --git a/app/scripts/modules/core/notification/modal/editNotification.html b/app/scripts/modules/core/notification/modal/editNotification.html
@@ -1,5 +1,5 @@
 <div modal-page>
-  <modal-close (dismiss)="$dismiss()"></modal-close>
+  <modal-close dismiss="$dismiss()"></modal-close>
   <div class="modal-header">
     <h3 data-purpose="modal-header">Edit Notification</h3>
   </div>

diff --git a/app/scripts/modules/core/pipeline/config/actions/delete/deletePipelineModal.html b/app/scripts/modules/core/pipeline/config/actions/delete/deletePipelineModal.html
@@ -1,5 +1,5 @@
 <div modal-page>
-  <modal-close (dismiss)="$dismiss()"></modal-close>
+  <modal-close dismiss="$dismiss()"></modal-close>
   <div class="modal-header">
     <h3>Really Delete {{pipeline.strategy === true ? 'Strategy' : 'Pipeline'}}?</h3>
   </div>

diff --git a/app/scripts/modules/core/pipeline/config/actions/disable/disablePipelineModal.html b/app/scripts/modules/core/pipeline/config/actions/disable/disablePipelineModal.html
@@ -1,5 +1,5 @@
 <div modal-page>
-  <modal-close (dismiss)="$dismiss()"></modal-close>
+  <modal-close dismiss="$dismiss()"></modal-close>
   <div class="modal-header">
     <h3>Really Disable Pipeline?</h3>
   </div>

diff --git a/app/scripts/modules/core/pipeline/config/actions/enable/enablePipelineModal.html b/app/scripts/modules/core/pipeline/config/actions/enable/enablePipelineModal.html
@@ -1,5 +1,5 @@
 <div modal-page>
-  <modal-close (dismiss)="$dismiss()"></modal-close>
+  <modal-close dismiss="$dismiss()"></modal-close>
   <div class="modal-header">
     <h3>Really Enable Pipeline?</h3>
   </div>

diff --git a/app/scripts/modules/core/pipeline/config/actions/history/showHistory.modal.html b/app/scripts/modules/core/pipeline/config/actions/history/showHistory.modal.html
@@ -1,5 +1,5 @@
 <div modal-page class="flex-fill modal-show-history">
-  <modal-close (dismiss)="$dismiss()"></modal-close>
+  <modal-close dismiss="$dismiss()"></modal-close>
   <div class="modal-header">
     <h3>Pipeline Revision History</h3>
   </div>

diff --git a/app/scripts/modules/core/pipeline/config/actions/json/editPipelineJsonModal.html b/app/scripts/modules/core/pipeline/config/actions/json/editPipelineJsonModal.html
@@ -1,5 +1,5 @@
 <div modal-page class="flex-fill">
-  <modal-close (dismiss)="$dismiss()"></modal-close>
+  <modal-close dismiss="$dismiss()"></modal-close>
   <div class="modal-header">
     <h3><span ng-if="!command.locked">Edit </span>{{isStrategy === true ? 'Strategy' : 'Pipeline'}} JSON</h3>
   </div>