Initial work enabling hierarchical tags

kael-shipman · Mar 6, 2021 · 5aeef74 · 5aeef74
1 parent 5536916
commit 5aeef74
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/src/core/components/operation-tag.jsx b/src/core/components/operation-tag.jsx
@@ -58,6 +58,7 @@ export default class OperationTag extends React.Component {
       layoutActions,
       getConfigs,
       getComponent,
+      specSelectors,
       specUrl,
     } = this.props
 
@@ -68,6 +69,7 @@ export default class OperationTag extends React.Component {
     } = getConfigs()
 
     // Get the necessary components
+    const OperationContainer = getComponent("OperationContainer", true)
     const Collapse = getComponent("Collapse")
     const Markdown = getComponent("Markdown", true)
     const DeepLink = getComponent("DeepLink")
@@ -137,7 +139,7 @@ export default class OperationTag extends React.Component {
         </h4>
 
         <Collapse isOpened={showTag}>
-          <div class="hierarchical-operation-tag-operations">
+          <div className="hierarchical-operation-tag-operations">
             {
               operations.map(op => {
                 const path = op.get("path")
@@ -195,7 +197,7 @@ export default class OperationTag extends React.Component {
       <div className="hierarchical-operation-tags" style={isRoot ? null : {margin: "0 0 0 2rem"}}>
       {
         childTags.map((tag, tagName) => {
-          return <HierarchicalOperationTag
+          return <OperationTag
             key={"operation-" + (tag.get("canonicalTagName") || tagName)}
             tagObj={tag.get("data")}
             tag={tagName}
@@ -208,7 +210,7 @@ export default class OperationTag extends React.Component {
             childTags={tag.get("childTags")}
             isRoot={false}
           />
-        })
+        }).toArray()
       }
       </div>
     )

diff --git a/src/core/components/operations.jsx b/src/core/components/operations.jsx
@@ -43,7 +43,6 @@ export default class Operations extends React.Component {
     // flat list, even if the `hierarchicalTags` option is set to `true`.
     let taggedOps = specSelectors.taggedOperations()
 
-    const OperationContainer = getComponent("OperationContainer", true)
     const OperationTag = getComponent("OperationTag")
 
     // Filter, if requested
@@ -76,7 +75,7 @@ export default class Operations extends React.Component {
       // hierarchy
 
       // For each raw tag....
-      for (const tagName in taggedOps) {
+      taggedOps.map((tagObj, tagName) => {
         // Split the raw tag name into parts
         const parts = tagName.split(tagSplitterChar);
 
@@ -104,27 +103,27 @@ export default class Operations extends React.Component {
 
           // If this is the last part, set data on this object
           if (i === parts.length - 1) {
-            current[part].data = taggedOps.get(tagName);
+            current[part].data = tagObj;
           }
 
           // Move to the next level of the hierarchy before looping around
           current = current[part].childTags;
         }
-      }
+      });
     } else {
       // If the `hierarchicalTags` option is not set, we just want to convert our flat tag map into
       // the right format
-      for (const tagName in taggedOps) {
+      taggedOps.map((tagObj, tagName) => {
         operationTagsRaw[tagName] = {
           canonicalName: tagName,
-          data: taggedOps.get(tagName),
+          data: tagObj,
           childTags: {}
         }
-      }
+      });
     }
 
     // Convert to immutable map
-    const operationTags = Im.fromJs(operationTagsRaw);
+    const operationTags = Im.fromJS(operationTagsRaw);
 
     // Return the render
     return operationTags.size === 0

diff --git a/src/core/index.js b/src/core/index.js
@@ -53,6 +53,8 @@ export default function SwaggerUI(opts) {
     showExtensions: false,
     showCommonExtensions: false,
     withCredentials: undefined,
+    hierarchicalTags: false,
+    tagSplitterChar: /[:|]/,
     supportedSubmitMethods: [
       "get",
       "put",