Skip to content

Commit ac5f89e

Browse files
committed
fixed #462
1 parent fe5bb46 commit ac5f89e

File tree

6 files changed

+33
-30
lines changed

6 files changed

+33
-30
lines changed

marklogic-data-hub/src/trace-ui/package.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
},
1616
"private": true,
1717
"dependencies": {
18+
"@angular-mdl/core": "^4.0.1",
19+
"@angular-mdl/popover": "^0.6.3",
20+
"@angular-mdl/select": "^0.10.4",
1821
"@angular/common": "^4.0.0",
1922
"@angular/compiler": "^4.0.0",
2023
"@angular/core": "^4.0.0",
@@ -23,12 +26,10 @@
2326
"@angular/platform-browser": "^4.0.0",
2427
"@angular/platform-browser-dynamic": "^4.0.0",
2528
"@angular/router": "^4.0.0",
26-
"@angular-mdl/core": "^4.0.1",
27-
"@angular-mdl/popover": "^0.6.3",
28-
"@angular-mdl/select": "^0.10.4",
2929
"angular2-moment": "^1.3.3",
30+
"classlist.js": "^1.1.20150312",
3031
"clipboard": "^1.6.1",
31-
"codemirror": "^5.25.0",
32+
"codemirror": "^5.26.0",
3233
"core-js": "^2.4.1",
3334
"font-awesome": "^4.7.0",
3435
"lodash": "^4.17.4",
@@ -42,22 +43,22 @@
4243
"zone.js": "^0.8.4"
4344
},
4445
"devDependencies": {
45-
"@types/codemirror": "0.0.38",
46-
"@angular/cli": "1.0.0",
46+
"@angular/cli": "1.0.2",
4747
"@angular/compiler-cli": "^4.0.0",
4848
"@types/jasmine": "2.5.38",
4949
"@types/lodash": "^4.14.58",
5050
"@types/node": "~6.0.60",
5151
"@types/semver": "^5.3.31",
5252
"codelyzer": "~2.0.0",
53+
"enhanced-resolve": "3.3.0",
5354
"jasmine-core": "~2.5.2",
5455
"jasmine-spec-reporter": "~3.2.0",
5556
"karma": "~1.4.1",
5657
"karma-chrome-launcher": "~2.0.0",
5758
"karma-cli": "~1.0.1",
59+
"karma-coverage-istanbul-reporter": "^0.2.0",
5860
"karma-jasmine": "~1.1.0",
5961
"karma-jasmine-html-reporter": "^0.2.2",
60-
"karma-coverage-istanbul-reporter": "^0.2.0",
6162
"npm": "4.1.2",
6263
"protractor": "~5.1.0",
6364
"rimraf": "^2.5.4",

marklogic-data-hub/src/trace-ui/src/polyfills.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,22 @@
1919
*/
2020

2121
/** IE9, IE10 and IE11 requires all of the following polyfills. **/
22-
// import 'core-js/es6/symbol';
23-
// import 'core-js/es6/object';
24-
// import 'core-js/es6/function';
25-
// import 'core-js/es6/parse-int';
26-
// import 'core-js/es6/parse-float';
27-
// import 'core-js/es6/number';
28-
// import 'core-js/es6/math';
29-
// import 'core-js/es6/string';
30-
// import 'core-js/es6/date';
31-
// import 'core-js/es6/array';
32-
// import 'core-js/es6/regexp';
33-
// import 'core-js/es6/map';
34-
// import 'core-js/es6/set';
22+
import 'core-js/es6/symbol';
23+
import 'core-js/es6/object';
24+
import 'core-js/es6/function';
25+
import 'core-js/es6/parse-int';
26+
import 'core-js/es6/parse-float';
27+
import 'core-js/es6/number';
28+
import 'core-js/es6/math';
29+
import 'core-js/es6/string';
30+
import 'core-js/es6/date';
31+
import 'core-js/es6/array';
32+
import 'core-js/es6/regexp';
33+
import 'core-js/es6/map';
34+
import 'core-js/es6/set';
3535

3636
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
37-
// import 'classlist.js'; // Run `npm install --save classlist.js`.
37+
import 'classlist.js'; // Run `npm install --save classlist.js`.
3838

3939
/** IE10 and IE11 requires the following to support `@angular/animation`. */
4040
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.

marklogic-data-hub/src/trace-ui/src/tsconfig.app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"outDir": "../out-tsc/app",
55
"module": "es2015",
66
"baseUrl": "",
7-
"types": []
7+
"types": ["app/codemirror/codemirror.types"]
88
},
99
"exclude": [
1010
"test.ts",

quick-start/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,15 @@
5050
"@types/node": "~6.0.60",
5151
"@types/semver": "^5.3.31",
5252
"codelyzer": "~2.0.0",
53+
"enhanced-resolve": "3.3.0",
5354
"jasmine-core": "~2.5.2",
5455
"jasmine-spec-reporter": "~3.2.0",
5556
"karma": "~1.4.1",
5657
"karma-chrome-launcher": "~2.0.0",
5758
"karma-cli": "~1.0.1",
59+
"karma-coverage-istanbul-reporter": "^0.2.0",
5860
"karma-jasmine": "~1.1.0",
5961
"karma-jasmine-html-reporter": "^0.2.2",
60-
"karma-coverage-istanbul-reporter": "^0.2.0",
6162
"npm": "4.1.2",
6263
"protractor": "~5.1.0",
6364
"rimraf": "^2.5.4",

quick-start/src/main/ui/app/entities/entities.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
{{ flow.flowName }}
4545
<span class="mdl-layout-spacer"></span>
4646
<i class="fa fa-trash" (click)="deleteFlow($event, flow, type.toUpperCase())"></i>
47-
<i class="fa fa-bug" *ngIf="flowHasError(entity.name, flow.flowName)"></i>
47+
<i class="fa fa-bug" *ngIf="flowHasError(entity.entityName, flow.flowName)"></i>
4848
</span>
4949
</div>
5050
</li>
@@ -94,6 +94,7 @@
9494
<mdl-tab-panel-title>
9595
<i class="fa fa-code" aria-hidden="true"></i>
9696
<span>{{ plugin.pluginType }}</span>
97+
<i class="fa fa-bug" *ngIf="pluginHasError(flow, plugin.pluginType)"></i>
9798
<i class="fa fa-asterisk" title="Unsaved Changes" *ngIf="plugin.$dirty && plugin.hasShown"></i>
9899
</mdl-tab-panel-title>
99100
<mdl-tab-panel-content>

quick-start/src/main/ui/app/entities/entities.service.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ export class EntitiesService {
4141

4242
savePlugin(entity: Entity, flowType: string, flow: Flow, plugin: Plugin) {
4343
return this.post(
44-
this.url(`/entities/${entity.entityName}/flows/${flowType}/${flow.flowName}/plugin/save`),
45-
_.omit(plugin, ['cm'])
46-
);
44+
this.url(`/entities/${entity.entityName}/flows/${flowType}/${flow.flowName}/plugin/save`),
45+
_.omit(plugin, ['cm', 'codemirrorConfig', 'history'])
46+
);
4747
}
4848

4949
validatePlugin(entity: Entity, flowType: string, flow: Flow, plugin: Plugin) {
5050
return this.post(
51-
this.url(`/entities/${entity.entityName}/flows/${flowType}/${flow.flowName}/plugin/validate`),
52-
plugin
53-
);
51+
this.url(`/entities/${entity.entityName}/flows/${flowType}/${flow.flowName}/plugin/validate`),
52+
plugin
53+
);
5454
}
5555

5656
getInputFlowOptions(flow: Flow) {

0 commit comments

Comments
 (0)