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.

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

[Bug] Support multiple same-level node types and improve items/array support #397

Merged
merged 19 commits into from
Feb 2, 2023

Conversation

sserrata
Copy link
Member

@sserrata sserrata commented Jan 30, 2023

Description

Some schemas can implement more than one node type at the same level, such as oneOf and properties, or any other combination. This change introduces changes to how createNodes processes schemas. Previously, there was an ordered precedent applied whereby we exited after the first match. With these changes, now all node types will be collected in an array and returned together, in the order they were processed.

Note: also includes improvements to how items/arrays are rendered

Note: fixes formatting issues with example tab labels - basically, just leaves them as-is instead of attempting to un-camel-case and capitalize the first letter of each word

Preview: https://docusaurus-openapi-36b86--pr397-nr3rt8ms.web.app/

Motivation and Context

Addresses issue observed in the following endpoint, whereby only the oneOf schema/node was processed and the properties were ignored: https://pan.dev/access/api/prisma-access-config/post-sse-config-v-1-address-groups/

Preview with fix: https://docusaurus-openapi-36b86--pr397-nr3rt8ms.web.app/config/post-sse-config-v-1-address-groups/

How Has This Been Tested?

Tested with the Prisma Access Config address-group spec referenced above. Can be found here: https://raw.githubusercontent.com/PaloAltoNetworks/pan.dev/master/openapi-specs/access/prisma-access-config/AddressGroups.yaml

Additional testing is required to ensure no regression bugs are introduced.

@sserrata sserrata added bug Something isn't working DO NOT MERGE labels Jan 30, 2023
@github-actions
Copy link

github-actions bot commented Jan 30, 2023

Size Change: +21.9 kB (0%)

Total Size: 4.46 MB

Filename Size Change
demo/.docusaurus/globalData.json 20.6 kB +554 B (+3%)
demo/build/assets/css/styles.********.css 109 kB +471 B (0%)
demo/build/assets/js/0d832478.********.js 27.6 kB +248 B (+1%)
demo/build/assets/js/12693653.********.js 27.1 kB +518 B (+2%)
demo/build/assets/js/14c44d4c.********.js 38.6 kB +214 B (+1%)
demo/build/assets/js/1e6c5cae.********.js 36.7 kB +980 B (+3%)
demo/build/assets/js/24916e73.********.js 35.8 kB +216 B (+1%)
demo/build/assets/js/2bb7a9e5.********.js 20.4 kB +270 B (+1%)
demo/build/assets/js/3946f914.********.js 36.1 kB +980 B (+3%)
demo/build/assets/js/3e0d14e9.********.js 24.8 kB +270 B (+1%)
demo/build/assets/js/40a238b6.********.js 27.1 kB +518 B (+2%)
demo/build/assets/js/466ac800.********.js 45.5 kB +496 B (+1%)
demo/build/assets/js/4964e910.********.js 25.9 kB +248 B (+1%)
demo/build/assets/js/641430d8.********.js 41.6 kB +176 B (0%)
demo/build/assets/js/66c76a57.********.js 36.9 kB +980 B (+3%)
demo/build/assets/js/68b61ac5.********.js 46.2 kB +496 B (+1%)
demo/build/assets/js/69a61f78.********.js 26.5 kB +518 B (+2%)
demo/build/assets/js/73b594ee.********.js 36.7 kB +980 B (+3%)
demo/build/assets/js/77264a1a.********.js 36 kB +980 B (+3%)
demo/build/assets/js/785615ec.********.js 20.4 kB +270 B (+1%)
demo/build/assets/js/7ed7dafe.********.js 27.5 kB +248 B (+1%)
demo/build/assets/js/86c45737.********.js 26.4 kB +270 B (+1%)
demo/build/assets/js/8961c7a6.********.js 25.7 kB +270 B (+1%)
demo/build/assets/js/8e0590db.********.js 35.7 kB +216 B (+1%)
demo/build/assets/js/91696e06.********.js 37 kB +980 B (+3%)
demo/build/assets/js/9315808a.********.js 9.01 kB +159 B (+2%)
demo/build/assets/js/935f2afb.********.js 36.7 kB +1.44 kB (+4%)
demo/build/assets/js/97810f3c.********.js 26.5 kB +248 B (+1%)
demo/build/assets/js/9b5caaf3.********.js 27 kB +518 B (+2%)
demo/build/assets/js/9c42c0f3.********.js 35.6 kB +540 B (+2%)
demo/build/assets/js/aa2f1ec7.********.js 25.4 kB +270 B (+1%)
demo/build/assets/js/ab6072f2.********.js 26.5 kB +518 B (+2%)
demo/build/assets/js/ae7f40a3.********.js 46.3 kB +496 B (+1%)
demo/build/assets/js/b5c059ef.********.js 35.6 kB +540 B (+2%)
demo/build/assets/js/c58fc7a8.********.js 39 kB +190 B (0%)
demo/build/assets/js/c65697f5.********.js 27 kB +248 B (+1%)
demo/build/assets/js/cf07762b.********.js 26.4 kB +270 B (+1%)
demo/build/assets/js/dd696920.********.js 26.4 kB +248 B (+1%)
demo/build/assets/js/e015ccf9.********.js 27 kB +518 B (+2%)
demo/build/assets/js/eae14b71.********.js 34.9 kB +540 B (+2%)
demo/build/assets/js/f212caf7.********.js 25.7 kB +270 B (+1%)
demo/build/assets/js/fcd67c8d.********.js 19.9 kB +270 B (+1%)
demo/build/assets/js/main.********.js 411 kB +1.29 kB (0%)
demo/build/assets/js/runtime~main.********.js 9.5 kB +100 B (+1%)
demo/build/assets/js/2ce4e62e.********.js 424 B +424 B (new file) 🆕
demo/build/assets/js/588ff8aa.********.js 399 B +399 B (new file) 🆕
ℹ️ View Unchanged
Filename Size Change
demo/build/assets/js/006e727e.********.js 13.9 kB 0 B
demo/build/assets/js/05f64ae1.********.js 2.81 kB 0 B
demo/build/assets/js/06b64fc1.********.js 575 B 0 B
demo/build/assets/js/06e5f0f0.********.js 27.3 kB 0 B
demo/build/assets/js/081bfb0d.********.js 9.92 kB 0 B
demo/build/assets/js/09e07b87.********.js 2.97 kB 0 B
demo/build/assets/js/14eb3368.********.js 9.26 kB 0 B
demo/build/assets/js/1639936b.********.js 7.65 kB 0 B
demo/build/assets/js/16577668.********.js 393 B +6 B (+2%)
demo/build/assets/js/177e86db.********.js 10.8 kB 0 B
demo/build/assets/js/19d75775.********.js 8.72 kB 0 B
demo/build/assets/js/1a4e3797.********.js 77.6 kB 0 B
demo/build/assets/js/1a8cc2a6.********.js 12 kB 0 B
demo/build/assets/js/1be78505.********.js 10.6 kB 0 B
demo/build/assets/js/1c54f54e.********.js 10.7 kB 0 B
demo/build/assets/js/1e6ff21d.********.js 10.8 kB 0 B
demo/build/assets/js/1f818248.********.js 12.2 kB 0 B
demo/build/assets/js/2c860537.********.js 7.33 kB 0 B
demo/build/assets/js/3136173c.********.js 361 B 0 B
demo/build/assets/js/326c3861.********.js 13.4 kB 0 B
demo/build/assets/js/3720c009.********.js 1.44 kB 0 B
demo/build/assets/js/3893.********.js 1.07 kB 0 B
demo/build/assets/js/39d00f16.********.js 13.4 kB 0 B
demo/build/assets/js/41cd56a1.********.js 10.2 kB 0 B
demo/build/assets/js/423cd203.********.js 13.8 kB 0 B
demo/build/assets/js/4261.********.js 463 B 0 B
demo/build/assets/js/4670.********.js 104 B 0 B
demo/build/assets/js/46afcded.********.js 8.21 kB 0 B
demo/build/assets/js/46e5c6ac.********.js 6.86 kB 0 B
demo/build/assets/js/47abaca6.********.js 2.88 kB 0 B
demo/build/assets/js/4935.********.js 1.05 kB 0 B
demo/build/assets/js/4965.********.js 1.33 MB 0 B
demo/build/assets/js/49bd3d39.********.js 17.6 kB 0 B
demo/build/assets/js/4b891ed6.********.js 11.3 kB 0 B
demo/build/assets/js/4b901b1a.********.js 350 B 0 B
demo/build/assets/js/4c5e977b.********.js 39.5 kB 0 B
demo/build/assets/js/55960ee5.********.js 383 B 0 B
demo/build/assets/js/55a6d13f.********.js 13.8 kB 0 B
demo/build/assets/js/56717cba.********.js 2.97 kB 0 B
demo/build/assets/js/57f1a671.********.js 11.4 kB 0 B
demo/build/assets/js/58ff8b1e.********.js 20.7 kB 0 B
demo/build/assets/js/597ddc40.********.js 10.5 kB 0 B
demo/build/assets/js/5fb917be.********.js 2.56 kB 0 B
demo/build/assets/js/63fc267d.********.js 11.3 kB 0 B
demo/build/assets/js/6a105426.********.js 354 B 0 B
demo/build/assets/js/7ca3ae45.********.js 17.6 kB 0 B
demo/build/assets/js/8003.********.js 5.45 kB 0 B
demo/build/assets/js/85d3c400.********.js 2.9 kB 0 B
demo/build/assets/js/85ec4403.********.js 4.68 kB +9 B (0%)
demo/build/assets/js/86b273b1.********.js 10.5 kB 0 B
demo/build/assets/js/86c346b0.********.js 538 B 0 B
demo/build/assets/js/8777.********.js 76.5 kB 0 B
demo/build/assets/js/881db345.********.js 394 B 0 B
demo/build/assets/js/8ab9b16e.********.js 9.95 kB 0 B
demo/build/assets/js/8d4e78cd.********.js 2.83 kB 0 B
demo/build/assets/js/8f36b2a3.********.js 172 B 0 B
demo/build/assets/js/8f441c78.********.js 13.3 kB 0 B
demo/build/assets/js/9127.********.js 104 B 0 B
demo/build/assets/js/93304a97.********.js 7.77 kB 0 B
demo/build/assets/js/94589c06.********.js 20.2 kB 0 B
demo/build/assets/js/967247e2.********.js 8.71 kB 0 B
demo/build/assets/js/a40c6d71.********.js 8.61 kB 0 B
demo/build/assets/js/a476e24e.********.js 344 B 0 B
demo/build/assets/js/a5491aaa.********.js 400 B 0 B
demo/build/assets/js/a6cd895f.********.js 20.7 kB 0 B
demo/build/assets/js/a728d93a.********.js 9.99 kB 0 B
demo/build/assets/js/ab09fd5c.********.js 20.8 kB 0 B
demo/build/assets/js/b4ebd305.********.js 17.6 kB 0 B
demo/build/assets/js/bead4b8e.********.js 3.02 kB 0 B
demo/build/assets/js/bf271e74.********.js 401 B 0 B
demo/build/assets/js/c5644638.********.js 337 B 0 B
demo/build/assets/js/c7a5be9f.********.js 10.2 kB 0 B
demo/build/assets/js/c7ded1cb.********.js 2.95 kB 0 B
demo/build/assets/js/cef3f2e2.********.js 5.8 kB 0 B
demo/build/assets/js/common.********.js 390 kB -8 B (0%)
demo/build/assets/js/d63c7029.********.js 2.92 kB 0 B
demo/build/assets/js/df203c0f.********.js 1.8 kB 0 B
demo/build/assets/js/e01f8d18.********.js 8.69 kB 0 B
demo/build/assets/js/e2ce9793.********.js 402 B 0 B
demo/build/assets/js/e5e5340c.********.js 2.48 kB 0 B
demo/build/assets/js/e8b309fb.********.js 577 B 0 B
demo/build/assets/js/eaf4471e.********.js 11.9 kB 0 B
demo/build/assets/js/ecc39b49.********.js 172 B 0 B
demo/build/assets/js/ee308fa3.********.js 10.1 kB 0 B
demo/build/assets/js/f4486b6b.********.js 11.9 kB 0 B
demo/build/assets/js/f65290a6.********.js 10.5 kB 0 B
demo/build/assets/js/f8409a7e.********.js 34.5 kB 0 B
demo/build/assets/js/f84e10c2.********.js 19.3 kB 0 B
demo/build/assets/js/fe97f0d1.********.js 20.2 kB 0 B
demo/build/index.html 89 kB 0 B

compressed-size-action

@github-actions
Copy link

github-actions bot commented Jan 30, 2023

Visit the preview URL for this PR (updated for commit 2b55d45):

https://docusaurus-openapi-36b86--pr397-nr3rt8ms.web.app

(expires Fri, 03 Mar 2023 21:44:00 GMT)

🔥 via Firebase Hosting GitHub Action 🌎

@sserrata sserrata changed the title [Bug] Enable generation of array of nodes [Bug] Support multiple same-level node types and improve items/array support Jan 31, 2023
@sserrata
Copy link
Member Author

Example of how arrays are now rendered in the UI:

Screenshot 2023-01-31 at 12 16 47 PM

@sserrata
Copy link
Member Author

Example of schema with allOf (that also includes an anyOf) and properties combined:

Screenshot 2023-01-31 at 1 24 22 PM

Note the array of "object"

Copy link
Collaborator

@blindaa121 blindaa121 left a comment

Choose a reason for hiding this comment

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

Tested with the following specs to ensure the following:

  • No breaking changes were introduced when generating docs via CLI command
  • Rendering both Request and Response schemas that included oneOf + properties
  • Body component within ApiDemoPanel contained oneOf and properties where applicable

Prisma Access Config

  • Addresses
  • AddressGroups
  • AntiSpywareSignatures
  • AntiSpywareProfiles
  • ApplicationFilters
  • Applications
  • AuthenticationProfiles
  • Certificates
  • DecryptionRules
  • DNSSecurityProfiles
  • ExternalDynamicLists
  • HIPObjects
  • IKECryptoProfiles
  • IKEGateways
  • IPSecCryptoProfiles
  • IPSecTunnels
  • MFAServers
  • QoSPolicyRules
  • QoSProfiles
  • RadiusServerProfiles
  • SCEPProfiles
  • Schedules
  • Services
  • TrafficSteering
  • VulnerabilityProtectionProfiles
  • VulnerabilityProtectionSignatures

CDL - Log Forwarding

  • HTTPSProfiles

SASE - Subscription API

  • Instance

@sserrata sserrata merged commit a21e6a7 into main Feb 2, 2023
@sserrata sserrata deleted the fix-node-schemas branch February 2, 2023 03:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants