Skip to content

Commit aecdef4

Browse files
author
Emmanouil Konstantinidis
committed
Use RequestUtils
1 parent 8dc98df commit aecdef4

File tree

4 files changed

+50
-8
lines changed

4 files changed

+50
-8
lines changed

rest_framework_docs/static/rest_framework_docs/js/components/liveapi.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ var _ = require('underscore');
22
var React = require('react');
33
var APIRequest = require('superagent');
44

5+
var RequestUtils = require('../utils/request');
56
var Request = require('./request');
67
var Response = require('./response');
78

@@ -15,7 +16,7 @@ var LiveAPIEndpoints = React.createClass({
1516

1617
getData: function () {
1718
var method = this.refs.request.state.method;
18-
return method === 'GET' || method === 'OPTIONS' ? null : (
19+
return RequestUtils.shouldAddData(method) ? null : (
1920
this.refs.request.state.data
2021
);
2122
},

rest_framework_docs/static/rest_framework_docs/js/components/request.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
var _ = require('underscore');
22
var React = require('react');
33

4+
var FieldsData = require('./request/fields-data');
45
var FieldUrl = require('./request/field-url');
56
var Header = require('./helpers/header');
67
var Methods = require('./request/methods');
7-
var FieldsData = require('./request/fields-data');
8+
var RequestUtils = require('../utils/request');
89

910
var Request = React.createClass({
1011

@@ -57,7 +58,7 @@ var Request = React.createClass({
5758
</div>
5859
</div>
5960

60-
{this.state.method === 'GET' || this.state.method === 'OPTIONS' ? null : (
61+
{RequestUtils.shouldAddData(this.state.method) ? null : (
6162
<div>
6263
<Header title='Data' />
6364
<FieldsData fields={endpoint.fields} data={this.state.data} onChange={this.handleDataFieldChange} />

rest_framework_docs/static/rest_framework_docs/js/dist.js

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32378,6 +32378,7 @@ var _ = require('underscore');
3237832378
var React = require('react');
3237932379
var APIRequest = require('superagent');
3238032380

32381+
var RequestUtils = require('../utils/request');
3238132382
var Request = require('./request');
3238232383
var Response = require('./response');
3238332384

@@ -32392,7 +32393,7 @@ var LiveAPIEndpoints = React.createClass({
3239232393

3239332394
getData: function getData() {
3239432395
var method = this.refs.request.state.method;
32395-
return method === 'GET' || method === 'OPTIONS' ? null : this.refs.request.state.data;
32396+
return RequestUtils.shouldAddData(method) ? null : this.refs.request.state.data;
3239632397
},
3239732398

3239832399
makeRequest: function makeRequest(event) {
@@ -32453,16 +32454,17 @@ var LiveAPIEndpoints = React.createClass({
3245332454

3245432455
module.exports = LiveAPIEndpoints;
3245532456

32456-
},{"./request":167,"./response":171,"react":159,"superagent":160,"underscore":163}],167:[function(require,module,exports){
32457+
},{"../utils/request":174,"./request":167,"./response":171,"react":159,"superagent":160,"underscore":163}],167:[function(require,module,exports){
3245732458
'use strict';
3245832459

3245932460
var _ = require('underscore');
3246032461
var React = require('react');
3246132462

32463+
var FieldsData = require('./request/fields-data');
3246232464
var FieldUrl = require('./request/field-url');
3246332465
var Header = require('./helpers/header');
3246432466
var Methods = require('./request/methods');
32465-
var FieldsData = require('./request/fields-data');
32467+
var RequestUtils = require('../utils/request');
3246632468

3246732469
var Request = React.createClass({
3246832470
displayName: 'Request',
@@ -32525,7 +32527,7 @@ var Request = React.createClass({
3252532527
React.createElement('input', { type: 'text', className: 'form-control input-sm', id: 'authorization', placeholder: 'Token' })
3252632528
)
3252732529
),
32528-
this.state.method === 'GET' || this.state.method === 'OPTIONS' ? null : React.createElement(
32530+
RequestUtils.shouldAddData(this.state.method) ? null : React.createElement(
3252932531
'div',
3253032532
null,
3253132533
React.createElement(Header, { title: 'Data' }),
@@ -32537,7 +32539,7 @@ var Request = React.createClass({
3253732539

3253832540
module.exports = Request;
3253932541

32540-
},{"./helpers/header":164,"./request/field-url":168,"./request/fields-data":169,"./request/methods":170,"react":159,"underscore":163}],168:[function(require,module,exports){
32542+
},{"../utils/request":174,"./helpers/header":164,"./request/field-url":168,"./request/fields-data":169,"./request/methods":170,"react":159,"underscore":163}],168:[function(require,module,exports){
3254132543
'use strict';
3254232544

3254332545
var _ = require('underscore');
@@ -32784,4 +32786,25 @@ var jsonPP = module.exports = {
3278432786
}
3278532787
};
3278632788

32789+
},{}],174:[function(require,module,exports){
32790+
'use strict';
32791+
32792+
module.exports = {
32793+
32794+
shouldAddData: function shouldAddData(method) {
32795+
if (method === 'GET' || method === 'OPTIONS') {
32796+
return true;
32797+
}
32798+
return false;
32799+
},
32800+
32801+
shouldAddHeader: function shouldAddHeader(permissions) {
32802+
if (permissions === 'AllowAny' || permissions === 'None') {
32803+
return true;
32804+
}
32805+
return false;
32806+
}
32807+
32808+
};
32809+
3278732810
},{}]},{},[172]);
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
module.exports = {
2+
3+
shouldAddData: function (method) {
4+
if (method === 'GET' || method === 'OPTIONS') {
5+
return true;
6+
}
7+
return false;
8+
},
9+
10+
shouldAddHeader: function (permissions) {
11+
if (permissions === 'AllowAny' || permissions === 'None') {
12+
return true;
13+
}
14+
return false;
15+
}
16+
17+
};

0 commit comments

Comments
 (0)