openapi-explorer 0.6.226 → 0.6.231

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openapi-explorer",
-  "version": "0.6.226",
+  "version": "0.6.231",
   "description": "OpenAPI Explorer - API viewer with dynamically generated components, documentation, and interaction console",
   "author": "Rhosys Developers <developers@rhosys.ch>",
   "repository": {

package/src/components/api-request.js

@@ -321,7 +321,6 @@ export default class ApiRequest extends LitElement {
 
     // For Loop - Main
     requestBodyTypes.forEach((reqBody) => {
-      let schemaAsObj;
       let reqBodyExamples = [];
 
       if (this.selectedRequestBodyType.includes('json') || this.selectedRequestBodyType.includes('xml') || this.selectedRequestBodyType.includes('text')) {
@@ -411,7 +410,7 @@ export default class ApiRequest extends LitElement {
 
       // Generate Schema
       if (reqBody.mimeType.includes('json') || reqBody.mimeType.includes('xml') || reqBody.mimeType.includes('text')) {
-        schemaAsObj = schemaInObjectNotation(reqBody.schema, {});
+        const schemaAsObj = schemaInObjectNotation(reqBody.schema, {});
         if (this.schemaStyle === 'table') {
           reqBodySchemaHtml = html`
             ${reqBodySchemaHtml}
@@ -658,7 +657,7 @@ export default class ApiRequest extends LitElement {
                       ${paramSchema.type === 'array' ? '[ ' : ''}
                       <a part="anchor anchor-param-example" class = "${this.allowTry === 'true' ? '' : 'inactive-link'}"
                         data-default-type="${paramSchema.type === 'array' ? paramSchema.type : 'string'}"
-                        data-default = "${paramSchema.type === 'array' ? (paramSchema.example && paramSchema.example.join('~|~') || '') : (paramSchema.example)}"
+                        data-default = "${Array.isArray(paramSchema.example) && paramSchema.example.join('~|~') || paramSchema.example || ''}"
                         @click="${(e) => {
                           const inputEl = e.target.closest('table').querySelector(`[data-pname="${fieldName}"]`);
                           if (inputEl) {
@@ -886,7 +885,7 @@ export default class ApiRequest extends LitElement {
     }
 
     // Add Authentication api keys if provided
-    this.api_keys.forEach((v) => {
+    this.api_keys.filter((v) => v.finalKeyValue).forEach((v) => {
       if (v.in === 'query') {
         fetchUrl = `${fetchUrl}${fetchUrl.includes('?') ? '&' : '?'}${v.name}=${encodeURIComponent(v.finalKeyValue)}`;
         return;

package/src/components/schema-table.js

@@ -247,7 +247,10 @@ export default class SchemaTable extends LitElement {
         </div>
         <div class='td key-type ${dataTypeCss}'>
           ${dataType === 'array' ? `${type}[]` : type}
-          <span style="font-family: var(--font-mono);">${readorWriteOnly} </span> </div>
+          <span style="font-family: var(--font-mono);" title="${readorWriteOnly === '🆁' && 'Read only attribute' || readorWriteOnly === '🆆' && 'Write only attribute' || ''}">
+            ${readorWriteOnly}
+          </span>
+        </div>
         <div class='td key-descr'>
           ${dataType === 'array' ? html`<span class="m-markdown-small">${unsafeHTML(marked(description))}</span>` : ''}
           ${schemaDescription ? html`<span class="m-markdown-small">${unsafeHTML(marked(schemaDescription))}</span>` : ''}

package/src/components/schema-tree.js

@@ -255,12 +255,12 @@ export default class SchemaTree extends LitElement {
           }
           <span class="${dataTypeCss}">
             ${dataType === 'array' ? `${type}[]` : `${type}`}
-            ${readorWriteOnly}
           </span>
         </div>
-        <div class='td key-descr'>
-          ${dataType === 'array' ? html`<span class="m-markdown-small">${unsafeHTML(marked(description))}</span>` : ''}
-          ${schemaDescription ? html`<span class="m-markdown-small">${unsafeHTML(marked(schemaDescription))}</span>` : ''}
+        <div class="td key-descr">
+          <span class="m-markdown-small" style="font-family: var(--font-mono); vertical-align: middle;" title="${readorWriteOnly === '🆁' && 'Read only attribute' || readorWriteOnly === '🆆' && 'Write only attribute' || ''}">
+            ${unsafeHTML(marked(`${readorWriteOnly && `${readorWriteOnly} ` || ''}${dataType === 'array' && description || schemaDescription || ''}`))}
+          </span>
           ${constraint ? html`<div style='display:inline-block; line-break:anywhere; margin-right:8px'><span class='bold-text'>Constraints: </span>${constraint}</div>` : ''}
           ${defaultValue ? html`<div style='display:inline-block; line-break:anywhere; margin-right:8px'><span class='bold-text'>Default: </span>${defaultValue}</div>` : ''}
           ${allowedValues ? html`<div style='display:inline-block; line-break:anywhere; margin-right:8px'><span class='bold-text'>Allowed: </span>${allowedValues}</div>` : ''}

package/src/templates/security-scheme-template.js

@@ -42,7 +42,8 @@ function onClearAllApiKeys() {
 // Updates the OAuth Access Token (API key), so it reflects in UI and gets used in TRY calls
 function updateOAuthKey(apiKeyId, tokenType = 'Bearer', accessToken) {
   const securityObj = this.resolvedSpec.securitySchemes.find((v) => (v.apiKeyId === apiKeyId));
-  securityObj.finalKeyValue = `${(tokenType.toLowerCase() === 'bearer' ? 'Bearer' : (tokenType.toLowerCase() === 'mac' ? 'MAC' : tokenType))} ${accessToken}`;
+  const tokenPrefix = tokenType && tokenType.toLowerCase() === 'bearer' ? 'Bearer' : tokenType;
+  securityObj.finalKeyValue = `${tokenPrefix}${tokenPrefix ? ' ' : ''}${accessToken}`;
   this.requestUpdate();
 }
 

package/src/utils/schema-utils.js

@@ -29,11 +29,7 @@ export function getTypeInfo(schema) {
     type: dataType,
     format: schema.format || '',
     pattern: (schema.pattern && !schema.enum) ? schema.pattern : '',
-    readOrWriteOnly: schema.readOnly
-      ? '🆁'
-      : schema.writeOnly
-        ? '🆆'
-        : '',
+    readOrWriteOnly: schema.readOnly && '🆁' || schema.writeOnly && '🆆' || '',
     deprecated: schema.deprecated ? '❌' : '',
     example: typeof schema.example === 'undefined'
       ? ''