Merge remote-tracking branch 'origin/development'

CHANGELOG.md

@@ -2,6 +2,16 @@
 <!-- Use the tags Added, Changed, Deprecated, Removed, Fixed, Security, and
      Contributor to describe changes -->
 
+## [0.7.3]
+###### 2018-03-14
+
+### Fixed
+* Bug where NO_CONTENT return codes were failing on Werkzeug WSGI 0.14
+
+### Changed
+* All node modules are now bundled into webpack
+
+
 ## [0.7.2]
 ###### 2018-03-12
 

appveyor.yml

@@ -1,4 +1,4 @@
-version: 0.7.2.{build}
+version: 0.7.3.{build}
 
 branches:
   only:

walkoff/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.7.2'
+__version__ = '0.7.3'
 
 
 def initialize_databases():

walkoff/client/package.json

@@ -66,7 +66,6 @@
     "jqueryui": "~1.11.1",
     "json-editor": "~0.7.28",
     "jstree": "~3.3.4",
-    "lodash": "~4.17.4",
     "moment": "~2.20.1",
     "ng-pick-datetime": "~4.3.2",
     "ng2-dnd": "^4.2.0",

walkoff/client/src/cases/cases.component.ts

@@ -7,6 +7,7 @@ import { Select2OptionData } from 'ng2-select2';
 import 'rxjs/add/operator/debounceTime';
 
 import { CasesService } from './cases.service';
+import { UtilitiesService } from '../utilities.service';
 
 import { CasesModalComponent } from './cases.modal.component';
 
@@ -31,7 +32,7 @@ interface ICaseHierarchy {
 	styleUrls: [
 		'./cases.css',
 	],
-	providers: [CasesService],
+	providers: [CasesService, UtilitiesService],
 })
 export class CasesComponent implements OnInit {
 	cases: Case[] = [];
@@ -115,6 +116,7 @@ export class CasesComponent implements OnInit {
 	constructor(
 		private casesService: CasesService, private modalService: NgbModal,
 		private toastyService: ToastyService, private toastyConfig: ToastyConfig,
+		private utils: UtilitiesService,
 	) {}
 
 	ngOnInit(): void {
@@ -214,7 +216,7 @@ export class CasesComponent implements OnInit {
 		modalRef.componentInstance.submitText = 'Add Case';
 		modalRef.componentInstance.workingCase = new Case();
 		modalRef.componentInstance.availableSubscriptions = this.availableSubscriptions;
-		modalRef.componentInstance.subscriptionTree = _.cloneDeep(this.subscriptionTree);
+		modalRef.componentInstance.subscriptionTree = this.utils.cloneDeep(this.subscriptionTree);
 
 		this._handleModalClose(modalRef);
 	}
@@ -226,10 +228,10 @@ export class CasesComponent implements OnInit {
 		const modalRef = this.modalService.open(CasesModalComponent, { windowClass: 'casesModal' });
 		modalRef.componentInstance.title = `Edit Case: ${caseToEdit.name}`;
 		modalRef.componentInstance.submitText = 'Save Changes';
-		modalRef.componentInstance.workingCase = _.cloneDeep(caseToEdit);
+		modalRef.componentInstance.workingCase = this.utils.cloneDeep(caseToEdit);
 		delete modalRef.componentInstance.workingCase.$$index;
 		modalRef.componentInstance.availableSubscriptions = this.availableSubscriptions;
-		modalRef.componentInstance.subscriptionTree = _.cloneDeep(this.subscriptionTree);
+		modalRef.componentInstance.subscriptionTree = this.utils.cloneDeep(this.subscriptionTree);
 
 		this._handleModalClose(modalRef);
 	}

walkoff/client/src/main.ts

@@ -3,6 +3,20 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
 import { MainModule } from './main.module';
 
+// Import global JS packages
+import 'jquery';
+import 'bootstrap';
+import 'select2';
+
+// Import global CSS packages
+import 'bootstrap/dist/css/bootstrap.min.css';
+import '@swimlane/ngx-datatable/release/index.css';
+import '@swimlane/ngx-datatable/release/themes/material.css';
+import '@swimlane/ngx-datatable/release/assets/icons.css';
+import 'font-awesome/css/font-awesome.min.css';
+import 'ng2-toasty/style-bootstrap.css';
+import 'select2/dist/css/select2.min.css';
+
 document.addEventListener('DOMContentLoaded', event => {
 	if (sessionStorage.getItem('refresh_token')) {
 		//TODO: figure out a good way of handling this

walkoff/client/src/main/main.css

@@ -1,6 +1,10 @@
-@import '/client/node_modules/@swimlane/ngx-datatable/release/index.css';
-@import '/client/node_modules/@swimlane/ngx-datatable/release/themes/material.css';
-@import '/client/node_modules/@swimlane/ngx-datatable/release/assets/icons.css';
+/* @import '~@swimlane/ngx-datatable/release/index.css';
+@import '~@swimlane/ngx-datatable/release/themes/material.css';
+@import '~@swimlane/ngx-datatable/release/assets/icons.css';
+@import '~bootstrap/dist/css/bootstrap.min.css';
+@import '~font-awesome/css/font-awesome.min.css';
+@import '~ng2-toasty/style-bootstrap.css';
+@import '~select2/dist/css/select2.min.css'; */
 
 /* h1 {
   font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif, sans-serif;

walkoff/client/src/playbook/playbook.component.ts

@@ -8,6 +8,13 @@ import 'rxjs/Rx';
 import { saveAs } from 'file-saver';
 import { plainToClass } from 'class-transformer';
 
+import * as cytoscape from 'cytoscape';
+import * as clipboard from 'cytoscape-clipboard';
+import * as edgehandles from 'cytoscape-edgehandles';
+import * as gridGuide from 'cytoscape-grid-guide';
+import * as panzoom from 'cytoscape-panzoom';
+import * as undoRedo from 'cytoscape-undo-redo';
+
 import { PlaybookService } from './playbook.service';
 import { AuthService } from '../auth/auth.service';
 import { UtilitiesService } from '../utilities.service';
@@ -37,6 +44,8 @@ import { ActionStatusEvent } from '../models/execution/actionStatusEvent';
 	templateUrl: './playbook.html',
 	styleUrls: [
 		'./playbook.css',
+		'../../node_modules/cytoscape-panzoom/cytoscape.js-panzoom.css',
+		'../../node_modules/ng2-dnd/bundles/style.css',
 	],
 	encapsulation: ViewEncapsulation.None,
 	providers: [PlaybookService, AuthService, UtilitiesService],
@@ -112,6 +121,13 @@ export class PlaybookComponent implements OnInit, AfterViewChecked, OnDestroy {
 	ngOnInit(): void {
 		this.toastyConfig.theme = 'bootstrap';
 
+		const cyDummy = cytoscape();
+		if (!cyDummy.clipboard) { clipboard(cytoscape, $); }
+		if (!cyDummy.edgehandles) { cytoscape.use(edgehandles); }
+		if (!cyDummy.gridGuide) { cytoscape.use(gridGuide); }
+		if (!cyDummy.panzoom) { cytoscape.use(panzoom); }
+		if (!cyDummy.undoRedo) { cytoscape.use(undoRedo); }
+
 		this.playbookService.getDevices().then(devices => this.devices = devices);
 		this.playbookService.getApis().then(appApis => this.appApis = appApis.sort((a, b) => a.name > b.name ? 1 : -1));
 		this.getActionStatusSSE();
@@ -509,7 +525,7 @@ export class PlaybookComponent implements OnInit, AfterViewChecked, OnDestroy {
 		});
 
 		const nodes = this.loadedWorkflow.actions.map(action => {
-			const node: any = { group: 'nodes', position: _.clone(action.position) };
+			const node: any = { group: 'nodes', position: this.utils.cloneDeep(action.position) };
 			node.data = {
 				id: action.id,
 				_id: action.id,
@@ -569,7 +585,7 @@ export class PlaybookComponent implements OnInit, AfterViewChecked, OnDestroy {
 
 		// Clone the loadedWorkflow first, so we don't change the parameters 
 		// in the editor when converting it to the format the backend expects.
-		const workflowToSave: Workflow = _.cloneDeep(this.loadedWorkflow);
+		const workflowToSave: Workflow = this.utils.cloneDeep(this.loadedWorkflow);
 
 		if (!workflowToSave.start) {
 			this.toastyService.warning('Workflow cannot be saved without a starting action.');
@@ -600,7 +616,7 @@ export class PlaybookComponent implements OnInit, AfterViewChecked, OnDestroy {
 				savePromise = this.playbookService.newWorkflow(this.loadedPlaybook.id, workflowToSave);
 			}
 		} else {
-			const playbookToSave: Playbook = _.cloneDeep(this.loadedPlaybook);
+			const playbookToSave: Playbook = this.utils.cloneDeep(this.loadedPlaybook);
 			playbookToSave.workflows = [workflowToSave];
 			savePromise = this.playbookService.newPlaybook(playbookToSave)
 				.then(newPlaybook => {
@@ -1060,7 +1076,7 @@ export class PlaybookComponent implements OnInit, AfterViewChecked, OnDestroy {
 
 		newNodes.forEach((n: any) => {
 			// Get a copy of the action we just copied
-			const pastedAction: Action = _.clone(this.loadedWorkflow.actions.find(a => a.id === n.data('_id')));
+			const pastedAction: Action = this.utils.cloneDeep(this.loadedWorkflow.actions.find(a => a.id === n.data('_id')));
 
 			const newActionUuid = UUID.UUID();
 

walkoff/client/src/playbook/playbook.css

@@ -1,5 +1,5 @@
-@import '/client/node_modules/cytoscape-panzoom/cytoscape.js-panzoom.css';
-@import '/client/node_modules/ng2-dnd/bundles/style.css';
+/* @import '/client/node_modules/cytoscape-panzoom/cytoscape.js-panzoom.css';
+@import '/client/node_modules/ng2-dnd/bundles/style.css'; */
 
 #main.playbookMain {
 	padding: 10px 15px 0 15px;

walkoff/client/src/playbook/playbook.d.ts

@@ -1,7 +1,6 @@
-declare var cytoscape: any;
+declare module 'cytoscape';
 declare module 'cytoscape-clipboard';
 declare module 'cytoscape-edgehandles';
 declare module 'cytoscape-grid-guide';
 declare module 'cytoscape-panzoom';
 declare module 'cytoscape-undo-redo';
-declare var _: any;

walkoff/client/src/polyfills.ts

@@ -27,6 +27,7 @@ import 'zone.js/dist/zone';
 
 import 'event-source-polyfill';
 import 'reflect-metadata';
+
 // if ('production' === ENV) {
 // 	// Production
 // } else {

walkoff/client/src/scheduler/scheduler.component.ts

@@ -9,6 +9,7 @@ import 'rxjs/add/operator/debounceTime';
 import { SchedulerModalComponent } from './scheduler.modal.component';
 
 import { SchedulerService } from './scheduler.service';
+import { UtilitiesService } from '../utilities.service';
 
 import { ScheduledTask } from '../models/scheduler/scheduledTask';
 
@@ -17,9 +18,10 @@ import { ScheduledTask } from '../models/scheduler/scheduledTask';
 	templateUrl: './scheduler.html',
 	styleUrls: [
 		'./scheduler.css',
+		'../../node_modules/ng-pick-datetime/styles/picker.min.css',
 	],
 	encapsulation: ViewEncapsulation.None,
-	providers: [SchedulerService],
+	providers: [SchedulerService, UtilitiesService],
 })
 export class SchedulerComponent implements OnInit {
 	schedulerStatus: string;
@@ -32,6 +34,7 @@ export class SchedulerComponent implements OnInit {
 	constructor(
 		private schedulerService: SchedulerService, private modalService: NgbModal,
 		private toastyService: ToastyService, private toastyConfig: ToastyConfig,
+		private utils: UtilitiesService,
 	) {}
 
 	/**
@@ -120,7 +123,7 @@ export class SchedulerComponent implements OnInit {
 		modalRef.componentInstance.title = `Edit Task ${task.name}`;
 		modalRef.componentInstance.submitText = 'Save Changes';
 		modalRef.componentInstance.availableWorkflows = this.availableWorkflows;
-		modalRef.componentInstance.workingScheduledTask = _.cloneDeep(task);
+		modalRef.componentInstance.workingScheduledTask = this.utils.cloneDeep(task);
 		delete modalRef.componentInstance.workingScheduledTask.$$index;
 
 		this._handleModalClose(modalRef);

walkoff/client/src/scheduler/scheduler.css

@@ -1,4 +1,4 @@
-@import '/client/node_modules/ng-pick-datetime/styles/picker.min.css';
+/* @import '/client/node_modules/ng-pick-datetime/styles/picker.min.css'; */
 
 .schedulerMain {
 	padding: 10px 15px;

walkoff/client/src/settings/settings.css

@@ -1,7 +1,3 @@
-/*@import '/client/node_modules/@swimlane/ngx-datatable/release/index.css';
-@import '/client/node_modules/@swimlane/ngx-datatable/release/themes/material.css';
-@import '/client/node_modules/@swimlane/ngx-datatable/release/assets/icons.css';*/
-
 .settingsMain {
 	padding: 10px 15px;
 }

walkoff/client/src/settings/settings.roles.component.ts

@@ -5,6 +5,7 @@ import { ToastyService, ToastyConfig } from 'ng2-toasty';
 import 'rxjs/add/operator/debounceTime';
 
 import { SettingsService } from './settings.service';
+import { UtilitiesService } from '../utilities.service';
 
 import { SettingsRoleModalComponent } from './settings.roles.modal.component';
 
@@ -19,7 +20,7 @@ import { GenericObject } from '../models/genericObject';
 		'./settings.css',
 	],
 	encapsulation: ViewEncapsulation.None,
-	providers: [SettingsService],
+	providers: [SettingsService, UtilitiesService],
 })
 export class SettingsRolesComponent {
 	availableResourceActions: AvailableResourceAction[] = [];
@@ -31,6 +32,7 @@ export class SettingsRolesComponent {
 	constructor(
 		private settingsService: SettingsService, private modalService: NgbModal,
 		private toastyService: ToastyService, private toastyConfig: ToastyConfig,
+		private utils: UtilitiesService,
 	) {
 		this.toastyConfig.theme = 'bootstrap';
 
@@ -80,7 +82,7 @@ export class SettingsRolesComponent {
 		modalRef.componentInstance.title = `Edit Role: ${role.name}`;
 		modalRef.componentInstance.submitText = 'Save Changes';
 		modalRef.componentInstance.availableResourceActions = this.availableResourceActions;
-		modalRef.componentInstance.workingRole = _.cloneDeep(role);
+		modalRef.componentInstance.workingRole = this.utils.cloneDeep(role);
 
 		this._handleModalClose(modalRef);
 	}

walkoff/client/src/settings/settings.roles.modal.component.ts

@@ -4,6 +4,7 @@ import { ToastyService, ToastyConfig } from 'ng2-toasty';
 import { Select2OptionData } from 'ng2-select2';
 
 import { SettingsService } from './settings.service';
+import { UtilitiesService } from '../utilities.service';
 
 import { Role } from '../models/role';
 import { AvailableResourceAction } from '../models/availableResourceAction';
@@ -15,7 +16,7 @@ import { Resource } from '../models/resource';
 	styleUrls: [
 		'./settings.css',
 	],
-	providers: [SettingsService],
+	providers: [SettingsService, UtilitiesService],
 })
 export class SettingsRoleModalComponent {
 	@Input() workingRole: Role;
@@ -32,6 +33,7 @@ export class SettingsRoleModalComponent {
 	constructor(
 		private settingsService: SettingsService, private activeModal: NgbActiveModal,
 		private toastyService: ToastyService, private toastyConfig: ToastyConfig,
+		private utils: UtilitiesService,
 	) {
 		this.toastyConfig.theme = 'bootstrap';
 
@@ -109,7 +111,7 @@ export class SettingsRoleModalComponent {
 			return;
 		}
 
-		const toSubmit: Role = _.cloneDeep(this.workingRole);
+		const toSubmit: Role = this.utils.cloneDeep(this.workingRole);
 
 		// Remove temp Ids for new resources
 		toSubmit.resources.forEach(resource => {

walkoff/client/webpack.common.js

@@ -19,6 +19,7 @@ const CheckerPlugin = require('awesome-typescript-loader').CheckerPlugin;
 // const LoaderOptionsPlugin = require('webpack/lib/LoaderOptionsPlugin');
 // const ScriptExtHtmlWebpackPlugin = require('script-ext-html-webpack-plugin');
 // const ngcWebpack = require('ngc-webpack');
+const ProvidePlugin = require('webpack/lib/ProvidePlugin')
 
 /**
  * Webpack Constants
@@ -83,7 +84,7 @@ module.exports = function (options) {
 				},
 				{
 					test: /\.css$/,
-					use: ['to-string-loader', 'css-loader'],
+					use: ['to-string-loader', 'style-loader', 'css-loader'],
 					exclude: [helpers.root('styles')]
 				},
 				{
@@ -101,8 +102,15 @@ module.exports = function (options) {
 					use: 'file-loader'
 				},
 				{
-					test: /\.(eot|woff2?|svg|ttf)([\?]?.*)$/,
-					use: 'file-loader'
+					test: /.(ttf|otf|eot|svg|woff(2)?)(\?[a-z0-9]+)?$/,
+					use: [{
+						loader: 'file-loader',
+						options: {
+							name: '[name].[ext]',
+							// outputPath: 'dist/',    // where the fonts will go
+							publicPath: '/client/dist/'       // override the default path
+						}
+					}]
 				}
 			]
 		},
@@ -131,6 +139,11 @@ module.exports = function (options) {
 				name: ['polyfills', 'vendor'].reverse()
 			}),
 
+			new ProvidePlugin({
+				$: "jquery",
+				jQuery: "jquery",
+			}),
+
 			// new ContextReplacementPlugin(
 			// 	// The (\\|\/) piece accounts for path separators in *nix and Windows
 			// 	/angular(\\|\/)core(\\|\/)@angular/,