Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Swagger ui redesign/custom dropdown #5381

Merged
merged 63 commits into from
Jun 6, 2019
Merged

Swagger ui redesign/custom dropdown #5381

merged 63 commits into from
Jun 6, 2019

Conversation

taraokelly
Copy link

@taraokelly taraokelly commented May 31, 2019 •
edited
Loading

Custom select/dropdown

Description

Created custom Dropdown with new design. Updated Schemes to use this.

(The other selects and the icon will be updated in subsequent PRs)

[EDIT] the icon has been updated to use the new Icon component.

Motivation and Context

Facelift

How Has This Been Tested?

Manually

Screenshots (if appropriate):

Screen Shot 2019-06-04 at 23 43 25

Screen Shot 2019-06-04 at 23 42 51

Checklist

My PR contains...

  • No code changes (src/ is unmodified: changes to documentation, CI, metadata, etc.)
  • Dependency changes (any modification to dependencies in package.json)
  • Bug fixes (non-breaking change which fixes an issue)
  • Improvements (misc. changes to existing features)
  • Features (non-breaking change which adds functionality)

My changes...

  • are breaking changes to a public API (config options, System API, major UI change, etc).
  • are breaking changes to a private API (Redux, component props, utility functions, etc.).
  • are breaking changes to a developer API (npm script behavior changes, new dev system dependencies, etc).
  • are not breaking changes.

Documentation

  • My changes do not require a change to the project documentation.
  • My changes require a change to the project documentation.
  • If yes to above: I have updated the documentation accordingly.

Automated tests

  • My changes can not or do not need to be tested.
  • My changes can and should be tested by unit and/or integration tests.
  • If yes to above: I have added tests to cover my changes.
  • If yes to above: I have taken care to cover edge cases in my tests.
  • All new and existing tests passed.

geraldglynn and others added 30 commits May 1, 2019 18:46
@shockey
improvement: OAS3 $ref friendly-name regex in model.jsx (via swagger-…
58d48f7 
…api#5334)
@shockey
improvement: relax schema description styling so Markdown can be effe…
96c444e 
…ctive (via swagger-api#5340)
@shockey
improvement: add isShown check to <ModelCollapse />'s prop `expande…
5d25a0b 
…d` logic (via swagger-api#5331)
Add and apply default button classes, styling
af2d308
Update buttons to use custom component
c982c99
Fix breaking unit tests
da74896
Replace button transition, replace EOF new-line
d4142af
Apply custom sui-btn-wrapper class
47a28a5
Add span wrapper for button-text (allows us to apply em padding / mar…
56d333e 
…gins on button element)
@shockey
security: CVE-2018-20834 (via swagger-api#5368)
5628ff0 
* bump minimum `bundlesize` version

* bump `node-sass`

* bump webpack + webpack-dev-server; update lockfile
@swaggerhub-bot
release: v3.22.2
54c045f
Abstract default classnames to Button component
3ca5c6b
Use classnames lib where applicable
2c96056
Fix unit tests
31f7242
Tidy up, remove unused classnames
52c64f5
@shockey
eliminate auth class
b3396fb
@shockey
eliminate authorize class
7f98d2c
@shockey
move .sui-btn--authorize to buttons stylesheet
bc440b3
Merge remote-tracking branch 'upstream/facelift' into swagger-ui-rede…
11e7873 
…sign/standardize-default-buttons

# Conflicts:
#	src/style/_buttons.scss
#	src/style/_variables.scss
Remove duplicate import after merge
9447b77
Merge remote-tracking branch 'upstream/master' into facelift
e5017bc
Merge remote-tracking branch 'upstream/facelift' into facelift
c5b3051
@taraokelly
Dropdown component set up
c22347b
@taraokelly
Dropdown id & custom class props
bb13e90
@taraokelly
Dropdown disabled prop
94ca144
@taraokelly
Merge with facelift branch
91a9fdc
@taraokelly
Basic DropDownItem, Updated Dropdown child classnames to not inherit …
daadac5 
…modifer
@taraokelly
Layout-utils restucture
9049352
Merge remote-tracking branch 'upstream/facelift' into facelift
8859fd7
@taraokelly
Dropdown Basic controls
2164c1a
Rody Kirwan and others added 14 commits May 31, 2019 16:48
Add temporary dropdown icon - to be replaced by fontawesome
d1f7a27
Move clickhandler to li element
3da2770
Wrap dropdown text in span
e5c3a19
Update alter-hue mixin to accept custom degree
8ad79d0
Update dropdown styling
76ce7e5
Apply custom Dropdown to "schemes"
e915637
Merge branch 'swagger-ui-redesign/custom-dropdown' of https://github.…
5e914a4 
…com/SmartBear/swagger-ui into swagger-ui-redesign/custom-dropdown

# Conflicts:
#	src/core/components/layout-utils/drop-down.jsx
@taraokelly
Dropdown onChange
5775f8b
@taraokelly
Merge branch 'swagger-ui-redesign/custom-dropdown' of https://github.…
1ce1e49 
…com/SmartBear/swagger-ui into swagger-ui-redesign/custom-dropdown
@taraokelly
Removed Dropdown labels
0d0194c
@taraokelly
Dropdown classname improvements
82a4ba5
@taraokelly
IE/Edge specific keyboard event keys
47ae9fd
@taraokelly
Removed onKeyPress
6eaa1a2
@taraokelly
Dropdown classname improvements
031f9cb
@taraokelly taraokelly changed the base branch from master to facelift June 1, 2019 08:19
shockey
shockey reviewed Jun 3, 2019
View reviewed changes
Copy link
Contributor

@shockey shockey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Question: did you change anything in layout-utils besides restructuring each component into its own file?

I didn't go over each component with a fine-toothed comb, but if there are source changes within any components, let me know and I'll take a closer look with manual diffing.

Also: that there's a merge conflict on this branch with layout-utils.jsx, take care to apply those changes to the relevant components.

src/core/utils.js Outdated
@@ -843,3 +843,7 @@ export function paramToValue(param, paramValues) {

return values[0]
}

export function xclass(...args) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change request: use classnames instead of keeping xclass around. At a glance, looks like we can switch out the invocations without changing anything else.

(I know this PR didn't introduce the function, but since we're cleaning up layout-utils, might as well fix this.)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem, removed 👍

Copy link
Author

@taraokelly taraokelly Jun 5, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And nope, I didn't make any changes beside moving things around. I didn't want to go outside of the scope of this ticket. So the main files that need attention are src/core/components/layout-utils/drop-down.jsx, src/core/components/schemes.jsx and src/style/_dropdown.scss.

src/core/components/model.jsx Outdated Show resolved Hide resolved
@shockey shockey merged commit 1135e7c into swagger-api:facelift Jun 6, 2019
@shockey
Copy link
Contributor

shockey commented Jun 6, 2019

thanks @taraokelly!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shockey shockey shockey approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@taraokelly @shockey @swaggerhub-bot @lshaw-sb