fix: improve code after review

demo/index.tsx

@@ -9,7 +9,7 @@ const DEFAULT_SPEC = 'openapi.yaml';
 const NEW_VERSION_SPEC = 'openapi-3-1.yaml';
 
 const demos = [
-  { value: NEW_VERSION_SPEC, label: 'OpenApi 3.1' },
+  { value: NEW_VERSION_SPEC, label: 'Petstore OpenAPI 3.1' },
   { value: 'https://api.apis.guru/v2/specs/instagram.com/1.0.0/swagger.yaml', label: 'Instagram' },
   {
     value: 'https://api.apis.guru/v2/specs/googleapis.com/calendar/v3/openapi.yaml',

src/components/ApiInfo/ApiInfo.tsx

@@ -100,8 +100,8 @@ export class ApiInfo extends React.Component<ApiInfoProps> {
               )) ||
                 null}
             </StyledMarkdownBlock>
-            <Markdown source={store.spec.info.description} data-role="redoc-description"/>
             <Markdown source={store.spec.info.summary} data-role="redoc-summary"/>
+            <Markdown source={store.spec.info.description} data-role="redoc-description"/>
             {externalDocs && <ExternalDocumentation externalDocs={externalDocs} />}
           </MiddlePanel>
         </Row>

src/services/models/Schema.ts

@@ -105,7 +105,7 @@ export class SchemaModel {
     this.title =
       schema.title || (isNamedDefinition(this.pointer) && JsonPointer.baseName(this.pointer)) || '';
     this.description = schema.description || '';
-    this.type = (Array.isArray(schema.type) && schema.type) || (schema.type || detectType(schema));
+    this.type = schema.type || detectType(schema);
     this.format = schema.format;
     this.enum = schema.enum || [];
     this.example = schema.example;
@@ -122,11 +122,14 @@ export class SchemaModel {
     this.const = schema.const || '';
 
     if (!!schema.nullable) {
-      if (Array.isArray(this.type)) this.type.push('null');
+      if (Array.isArray(this.type) && !this.type.includes('null')) {
-      else this.type = [this.type, 'null'];
+        this.type = [...this.type, 'null'];
+      }
     }
 
-    this.displayType = Array.isArray(this.type) ? this.type.join(' or ') : this.type;
+    this.displayType = Array.isArray(this.type)
+      ? this.type.map(item => item === null ? 'null' : item).join(' or ')
+      : this.type;
 
     if (this.isCircular) {
       return;
@@ -193,7 +196,7 @@ export class SchemaModel {
       const title =
         isNamedDefinition(variant.$ref) && !merged.title
           ? JsonPointer.baseName(variant.$ref)
-          : merged.title;
+          : (merged.const && JSON.stringify(merged.const)) || merged.title;
 
       const schema = new SchemaModel(
         parser,

src/utils/__tests__/openapi.test.ts

@@ -174,10 +174,56 @@ describe('Utils', () => {
       expect(isPrimitiveType(schema)).toEqual(false);
     });
 
-    it('Should return false for array of strings', () => {
+    it('should return true for array contains object and schema hasn\'t properties', () => {
       const schema = {
         type: ['object', 'string'],
       };
+      expect(isPrimitiveType(schema)).toEqual(true);
+    });
+
+    it('should return false for array contains object and schema has properties', () => {
+      const schema = {
+        type: ['object', 'string'],
+        properties: {
+          a: {
+            type: 'string',
+          },
+        },
+      };
+      expect(isPrimitiveType(schema)).toEqual(false);
+    });
+
+    it('should return false for array contains array type and schema has items', () => {
+      const schema = {
+        type: ['array'],
+        items: {
+          type: 'object',
+          additionalProperties: true,
+        },
+      };
+      expect(isPrimitiveType(schema)).toEqual(false);
+    });
+
+    it('should return false for array contains object and array types and schema has items', () => {
+      const schema = {
+        type: ['array', 'object'],
+        items: {
+          type: 'object',
+          additionalProperties: true,
+        },
+      };
+      expect(isPrimitiveType(schema)).toEqual(false);
+    });
+
+    it('should return false for array contains object and array types and schema has properties', () => {
+      const schema = {
+        type: ['array', 'object'],
+        properties: {
+          a: {
+            type: 'string',
+          },
+        },
+      };
       expect(isPrimitiveType(schema)).toEqual(false);
     });
 
@@ -185,7 +231,7 @@ describe('Utils', () => {
       const schema = {
         type: ['object', 'string', 'null'],
       };
-      expect(isPrimitiveType(schema)).toEqual(false);
+      expect(isPrimitiveType(schema)).toEqual(true);
     });
 
     it('Should return false for array with non-empty objects', () => {

src/utils/openapi.ts

@@ -69,7 +69,7 @@ export function getOperationSummary(operation: ExtendedOpenAPIOperation): string
     operation.operationId ||
     (operation.description && operation.description.substring(0, 50)) ||
     operation.pathName ||
-   '<no summary>'
+    '<no summary>'
   );
 }
 
@@ -116,22 +116,20 @@ export function isPrimitiveType(schema: OpenAPISchema, type: string | string[] |
     return false;
   }
 
-  if (type === 'object') {
+  let isPrimitive = true;
-    return schema.properties !== undefined
+  const isArray = Array.isArray(type);
+
+  if (type === 'object' || (isArray && type?.includes('object'))) {
+    isPrimitive = schema.properties !== undefined
       ? Object.keys(schema.properties).length === 0
       : schema.additionalProperties === undefined;
   }
 
-  if (type === 'array') {
+  if (schema.items !== undefined && (type === 'array' || (isArray && type?.includes('array')))) {
-    if (schema.items === undefined) {
+    isPrimitive = false;
-      return true;
-    }
-    return false;
   }
 
-  if (Array.isArray(type)) return false
+  return isPrimitive;
-
-  return true;
 }
 
 export function isJsonLike(contentType: string): boolean {
@@ -589,10 +587,10 @@ export function setSecuritySchemePrefix(prefix: string) {
 }
 
 export const shortenHTTPVerb = verb =>
-  ({
+({
-    delete: 'del',
+  delete: 'del',
-    options: 'opts',
+  options: 'opts',
-  }[verb] || verb);
+}[verb] || verb);
 
 export function isRedocExtension(key: string): boolean {
   const redocExtensions = {