Fixed Format and Readonly properties displaying (#2296)

* Fixed non-working images in API descriptions * Removed duplicated styles * Fixed Format and Readonly properties displaying * Double quotes ES lint fix
Azure · Sep 20, 2023 · d86cb77 · d86cb77
1 parent 3a67d03
commit d86cb77
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/models/typeDefinition.ts b/src/models/typeDefinition.ts
@@ -116,10 +116,15 @@ export abstract class TypeDefinitionProperty {
     constructor(name: string, contract: SchemaObjectContract, isRequired: boolean) {
         this.name = contract.title || name;
         this.description = contract.description;
-        this.type = new TypeDefinitionPropertyTypePrimitive(contract.format || contract.type || "object");
         this.readOnly = contract.readOnly ?? false;
         this.required = isRequired;
 
+        const typeAndFormat = 
+            contract.type 
+                ? contract.format ? contract.type + " (" + contract.format + ")" : contract.type
+                : "object";
+        this.type = new TypeDefinitionPropertyTypePrimitive(typeAndFormat);
+
         if (contract.rawSchemaFormat) {
             this.rawSchema = contract.rawSchema;
             this.rawSchemaFormat = contract.rawSchemaFormat;
@@ -365,7 +370,7 @@ export class TypeDefinitionObjectProperty extends TypeDefinitionProperty {
                     const propertySchemaObject = item.properties[propertyName];
                     const propertyNameToDisplay = (prefix ? prefix + "." : "") + propertyName;
 
-                    hasReadOnly = propertySchemaObject.readOnly ?? false;
+                    if (!hasReadOnly) hasReadOnly = propertySchemaObject.readOnly ?? false;
 
                     if (!propertySchemaObject) {
                         return;