fix: Fix complex descriptions (with constraints)

diplodoc-platform · Jul 11, 2024 · 545f9c4 · 545f9c4
1 parent f2490f0
commit 545f9c4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/src/includer/traverse/description.ts b/src/includer/traverse/description.ts
@@ -1,5 +1,4 @@
 import {OpenJSONSchema} from '../models';
-import {concatNewLine} from '../utils';
 
 type Field = {
     key: keyof OpenJSONSchema;
@@ -92,17 +91,14 @@ function concatConstraint(
     constraintLabel: string,
     notWrapValueIntoCode = false,
 ) {
-    if (typeof constraint !== 'undefined') {
-        return concatNewLine(
-            description,
-            `<span class="openapi-description-annotation">${constraintLabel}</span> ${prepareConstraintValue(
-                constraint,
-                notWrapValueIntoCode,
-            )}`,
-        );
+    if (typeof constraint === 'undefined') {
+        return description;
     }
 
-    return description;
+    constraint = prepareConstraintValue(constraint, notWrapValueIntoCode);
+    description = description.replace(/\n$/, '');
+
+    return `${description}\n\n*${constraintLabel}*{.openapi-description-annotation} ${constraint}\n`;
 }
 
 function prepareConstraintValue(value: unknown, notWrapValueIntoCode: boolean) {

diff --git a/src/runtime/index.scss b/src/runtime/index.scss
@@ -13,9 +13,10 @@
     --dc-openapi-highlight: rgb(233, 174, 86);
 
     .openapi-description-annotation {
-        color: gray;
+        font-style: normal;
+        color: var(--g-color-text-hint);
     }
-    
+
     &__required {
         color: var(--g-color-text-danger);
     }
@@ -48,7 +49,7 @@
         &__wrapper {
             position: relative;
             max-width: 100%;
-            display: inline-block;  
+            display: inline-block;
         }
 
         & * {