Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit b480ecb

Browse files
committed
Fix user-defined routes detection + resolve type hints
1 parent af6ae36 commit b480ecb

File tree

12 files changed

+26
-24
lines changed

12 files changed

+26
-24
lines changed

src/ServiceStack.Admin.Web/dist/app.bundle.js

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ServiceStack.Admin.Web/dist/vendor.bundle.js

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/ServiceStack.Admin.Web/src/AutoQuery.tsx

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,24 @@ class App extends React.Component<any, any> {
3333
constructor(props?, context?) {
3434
super(props, context);
3535

36-
var operationNames = this.props.metadata.operations.map(op => op.request);
36+
const operationNames = this.props.metadata.operations.map(op => op.request);
3737

38-
var viewerArgs = {}, operations = {}, types = {};
38+
const viewerArgs = {}, operations = {}, types = {};
3939
operationNames.forEach(name => {
4040
viewerArgs[name] = {};
41-
var aqViewer = this.getAutoQueryViewer(name);
41+
const aqViewer = this.getAutoQueryViewer(name);
4242
if (aqViewer && aqViewer.args) {
4343
aqViewer.args.forEach(arg => viewerArgs[name][arg.name] = arg.value);
4444
}
4545

4646
operations[name] = this.props.metadata.operations.filter(op => op.request === name)[0];
4747
});
4848

49+
console.log(this.props.metadata);
4950
this.props.metadata.types.forEach(t => types[t.name] = t);
5051

51-
var operationState = {};
52-
var json = localStorage.getItem("v1/operationState");
52+
let operationState = {};
53+
let json = localStorage.getItem("v1/operationState");
5354
if (json)
5455
operationState = JSON.parse(json);
5556

@@ -89,8 +90,8 @@ class App extends React.Component<any, any> {
8990
}
9091

9192
getAutoQueryViewerArgValue(name:string, argName:string) {
92-
var aqViewer = this.getAutoQueryViewer(name);
93-
var arg = aqViewer
93+
const aqViewer = this.getAutoQueryViewer(name);
94+
const arg = aqViewer
9495
? aqViewer.args.filter(x => x.name === argName)[0]
9596
: null;
9697
return arg != null
@@ -165,7 +166,7 @@ class App extends React.Component<any, any> {
165166
}
166167

167168
setOperationValues(opName, op) {
168-
var operationState = Object.assign({}, this.state.operationState);
169+
const operationState = Object.assign({}, this.state.operationState);
169170
operationState[opName] = op;
170171
this.setState({ operationState });
171172
localStorage.setItem("v1/operationState", JSON.stringify(operationState));
@@ -217,8 +218,8 @@ class App extends React.Component<any, any> {
217218
}
218219

219220
render() {
220-
var selected = this.getSelected(this.props.name);
221-
var opName = selected && selected.name;
221+
const selected = this.getSelected(this.props.name);
222+
const opName = selected && selected.name;
222223
return (
223224
<div style={{ height: '100%' }}>
224225
<Header title={this.getTitle(selected)} onSidebarToggle={e => this.toggleSidebar() } />

src/ServiceStack.Admin.Web/src/Content.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ export default class Content extends React.Component<any, any> {
5050
}
5151

5252
getAutoQueryUrl(format:string) {
53-
const firstRoute = (this.props.selected.requestType.routes || []).filter(x => x.path.indexOf('{') === -1)[0];
53+
const firstRoute = (this.props.selected.operation.routes || []).filter(x => x.path.indexOf('{') === -1)[0];
5454

5555
const path = firstRoute
5656
? firstRoute.path
5757
: `/${format || 'html'}/reply/` + this.props.selected.requestType.name;
5858

59-
var url = combinePaths(this.props.config.servicebaseurl, path);
59+
let url = combinePaths(this.props.config.servicebaseurl, path);
6060

6161
if (firstRoute && format)
6262
url += "." + format;

src/ServiceStack.Admin.Web/src/shared.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export const normalize = (dto: any, deep?: boolean) => {
2424
return to;
2525
}
2626
if (typeof dto != "object") return dto;
27-
var o = {};
27+
const o = {};
2828
for (let k in dto) {
2929
o[normalizeKey(k)] = deep ? normalize(dto[k], deep) : dto[k];
3030
}
@@ -38,7 +38,7 @@ export const getField = (o: any, name: string) =>
3838

3939
export const parseResponseStatus = (json, defaultMsg=null) => {
4040
try {
41-
var err = JSON.parse(json);
41+
const err = JSON.parse(json);
4242
return sanitize(err.ResponseStatus || err.responseStatus);
4343
} catch (e) {
4444
return {

src/ServiceStack.Admin.Web/wwwroot/dist/app.bundle.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ServiceStack.Admin.Web/wwwroot/dist/app.bundle.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ServiceStack.Admin.Web/wwwroot/dist/vendor.bundle.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ServiceStack.Admin.Web/wwwroot/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="UTF-8">
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=0, maximum-scale=1, minimum-scale=1">
7-
<title>ServiceStack.Admin.Web</title>
7+
<title>AutoQuery</title>
88
<link href="/dist/app.css" rel="stylesheet"></head>
99
<body>
1010

src/ServiceStack.Admin/ss_admin/dist/app.bundle.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ServiceStack.Admin/ss_admin/dist/app.bundle.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ServiceStack.Admin/ss_admin/dist/vendor.bundle.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)