Commit Graph

3381 Commits

Author SHA1 Message Date
Owen Conti
44ece46cd3 Fixes #3633
Make sure PrimitiveModel uses the schema's title first and then falls back to the passed-in `name` property. Added enzyme test for functionality.
2017-09-17 09:49:13 -06:00
Owen Conti
f63f022e0c Remove .only from utils test 2017-09-17 09:48:26 -06:00
Owen Conti
b855c25406 Slightly increase size available for property names. Change units to em and add a margin to separate the property name from the property type. 2017-09-17 09:48:03 -06:00
Owen Conti
08282205aa Fix property key: value alignment in array-model 2017-09-17 09:45:33 -06:00
Alexander Vangelov
90fa7065f8 Merge branch 'master' into master 2017-09-16 11:24:36 -04:00
Owen Conti
6f98fa9f3b Fixes after merge with ft/3584 branch 2017-09-15 22:31:02 -06:00
Owen Conti
f4efae0145 Merge branch 'ft/performance' into ft/3598-responses-shouldComponentUpdate
# Conflicts:
#	src/core/components/operation.jsx
#	src/core/components/operations.jsx
#	src/core/components/response.jsx
#	src/core/components/responses.jsx
2017-09-15 22:30:23 -06:00
Kyle
aee5e75913 Merge pull request #3673 from shockey/v/3.2.1
v3.2.1
2017-09-15 21:22:37 -07:00
Owen Conti
18cc3c84a2 Merge branch 'ft/performance' into ft/3584-operation-container-component 2017-09-15 22:18:59 -06:00
Owen Conti
5b87af7e7f Merge branch 'ft/performance' of github.com:swagger-api/swagger-ui into ft/performance 2017-09-15 22:18:30 -06:00
Owen Conti
9f473cd862 Merge pull request #3672 from swagger-api/master
master into ft/performance
2017-09-15 22:16:07 -06:00
Kyle Shockey
a625177c38 v3.2.1 2017-09-15 21:15:21 -07:00
Owen Conti
91a4794ab5 Merge ft/performance (#3670)
* Updated docs for correct usage of SWAGGER_JSON

* Removed href attribute from anchor tag if deeplinking is disabled

* If deeplinking is disabled the anchor tag has no href attribute as a result the mouse pointer is not a pointer as it is no longer a hyperlink, setting the cursor explicitly to pointer.

* Refactor: use ternary operators at attribute level instead of element level

* Only polyfill Promise if it doesn't exist at all

* v3.1.7

* Typo fix

* fix #3624

* Squash commit: OAS3 Try-It-Out changes

* Parse JSON requestBodies so Client can consume them correctly

* Use Client branch

* Fix typo in swagger-client dependency

* Fix property names being displayed in array models

* Working on refactoring of model.jsx

* Fit linter and tests

* Add comment to array-model for to clarify change. Rework logic in `Model.render()` to fix bug with overriding name and schema from `$ref` definition.

* v3.2.0

* fromJS does not maintain order of object properties. Use a reviver function with fromJS inside the response.jsx component for the passed down schema prop.

* OAS3 Accept header control: Component-side

* OAS3 Accept header control: State-side

* Update response.jsx to use already existing, fromJSOrdered function

* Added test for response.jsx to make sure properties are passed to `ModelExample` component in the correct order

* Remove `it.only` from new test

* Fixes #3596

Wrap `isShownKey` values in a function that replaces spaces with underscores. When parsing the hash on route change, replace the spaces in the values with underscores again.

* Replace spaces with underscores when setting the hash value and inserting the ID into the DOM. Escape the deep link path when querying for the DOM element on hash change.

* Handle null value in createDeepLinkPath

* Add extra check for String types in `createDeepLinkPath`. Add `trim()` call on passed-in value in `createDeepLinkPath`. Added unit tests for new deep link util functions.

* LINTING!

* Roll back win import removal

Lost in merge conflict....

* More merge oversights...
2017-09-15 22:09:35 -06:00
Owen Conti
9f5a307fce Merge branch 'ft/performance' into ft/3584-operation-container-component
# Conflicts:
#	src/core/components/operation.jsx
#	src/core/components/operations.jsx
#	src/core/components/responses.jsx
2017-09-15 22:03:14 -06:00
Owen Conti
46b5ae6070 Merge branch 'master' of github.com:swagger-api/swagger-ui into ft/performance 2017-09-15 21:53:00 -06:00
Kyle
a777e9ba91 Merge pull request #3669 from shockey/bug/oas3-accept-controls
OAS3: Accept header control
2017-09-15 20:38:05 -07:00
Kyle Shockey
ae5ad484d9 More merge oversights... 2017-09-15 20:33:16 -07:00
Kyle Shockey
6010245210 Roll back win import removal
Lost in merge conflict....
2017-09-15 20:29:49 -07:00
Kyle
bd5424308f Merge branch 'master' into bug/oas3-accept-controls 2017-09-15 20:21:27 -07:00
Kyle
ef5904f3f0 Merge pull request #3668 from owenconti/test/3667-escaping-utils-tests
Deep link path util tests
2017-09-15 20:19:28 -07:00
Kyle Shockey
ef8b37a580 LINTING! 2017-09-15 20:17:35 -07:00
Kyle
fa312cb70d Merge branch 'master' into bug/oas3-accept-controls 2017-09-15 20:11:20 -07:00
AlexVangelov
c1abdfb1c4 follow lowercase naming convention in tests 2017-09-15 21:04:38 -04:00
AlexVangelov
5bf6d2ff0b Merge branches 'master' and 'master' of github.com:AlexanderVangelov/swagger-ui 2017-09-15 20:53:52 -04:00
AlexVangelov
4172e33e04 satisfy project lint rules 2017-09-15 20:52:55 -04:00
Alexander Vangelov
34e8fffb65 Merge branch 'master' into master 2017-09-15 20:40:46 -04:00
Owen Conti
33ee880f36 Add extra check for String types in createDeepLinkPath. Add trim() call on passed-in value in createDeepLinkPath. Added unit tests for new deep link util functions. 2017-09-15 17:17:45 -06:00
Owen Conti
acac3ee875 Merge branch 'master' of github.com:swagger-api/swagger-ui 2017-09-15 16:51:10 -06:00
Kyle
11d8a341e7 Merge pull request #3661 from owenconti/bug/3596-permalink-encoding
Fixes #3596 - Deep linking issue with spaces
2017-09-15 14:49:22 -07:00
AlexVangelov
9b1a6141df OAuth2 authorizationUrl with extra query parameters (should include double '?') 2017-09-15 15:57:41 -04:00
Owen Conti
78ed1e60f3 Merge branch 'master' of github.com:swagger-api/swagger-ui 2017-09-14 14:20:10 -06:00
Joshua Whatley
82b9341a06 Changing word-break to follow standard
Changed "break-word" to "break-all" as this is standard across all
browsers and results with consistent behavior.
2017-09-13 21:23:49 -07:00
Owen Conti
840912cb56 Handle null value in createDeepLinkPath 2017-09-13 21:38:07 -06:00
Owen Conti
a6e070ac76 Replace spaces with underscores when setting the hash value and inserting the ID into the DOM. Escape the deep link path when querying for the DOM element on hash change. 2017-09-13 21:32:46 -06:00
Owen Conti
16364fb81e Merge branch 'master' of github.com:swagger-api/swagger-ui into bug/3596-permalink-encoding 2017-09-13 17:25:38 -06:00
Owen Conti
430e2a970f Fixes #3596
Wrap `isShownKey` values in a function that replaces spaces with underscores. When parsing the hash on route change, replace the spaces in the values with underscores again.
2017-09-13 17:20:37 -06:00
Kyle
c7cb902eee Merge pull request #3655 from owenconti/bug/3032-wrong-properties-order
Fixes #3032 - Wrong property order
2017-09-13 12:21:20 -07:00
Owen Conti
ef99b7e434 Remove it.only from new test 2017-09-12 23:09:21 -06:00
Owen Conti
cade5100e0 Merge branch 'master' of github.com:swagger-api/swagger-ui into bug/3032-wrong-properties-order 2017-09-12 23:07:36 -06:00
Owen Conti
cb88cd53b6 Added test for response.jsx to make sure properties are passed to ModelExample component in the correct order 2017-09-12 23:07:11 -06:00
Owen Conti
a47cc284f7 Update response.jsx to use already existing, fromJSOrdered function 2017-09-12 23:06:24 -06:00
Kyle Shockey
277cc81a8c OAS3 Accept header control: State-side 2017-09-12 19:39:52 -07:00
Kyle Shockey
26edaa5f0b OAS3 Accept header control: Component-side 2017-09-12 17:22:51 -07:00
Owen Conti
7cd42992f2 Merge branch 'master' of github.com:swagger-api/swagger-ui 2017-09-12 17:14:39 -06:00
Kyle
746e247834 Merge pull request #3650 from owenconti/bug/3490-anyOf-oneOf-not
Fixes #3490 (mostly)
2017-09-11 19:59:00 -07:00
Kyle
8a4d2461d8 Merge branch 'master' into bug/3490-anyOf-oneOf-not 2017-09-11 19:54:59 -07:00
Kyle
72f01b631e Merge branch 'master' into bug/3032-wrong-properties-order 2017-09-11 19:51:02 -07:00
Owen Conti
408e038b2d fromJS does not maintain order of object properties. Use a reviver function with fromJS inside the response.jsx component for the passed down schema prop. 2017-09-11 20:28:58 -06:00
Ron
65ff161c0b Merge pull request #3579 from OpenGov/bug/SWAGGER_JSON-doc-fix
Updated docs for correct usage of SWAGGER_JSON
2017-09-11 05:25:16 -07:00
Ron
93fcf06620 Merge branch 'master' into bug/SWAGGER_JSON-doc-fix 2017-09-11 05:21:10 -07:00