Merge branch 'master' into patch-4

asyncapi · Oct 15, 2023 · 403b05c · 403b05c
2 parents 22e8b53 + 9e49741
commit 403b05c
Show file tree

Hide file tree

Showing 11 changed files with 70 additions and 84 deletions.
diff --git a/library/package-lock.json b/library/package-lock.json
diff --git a/library/package.json b/library/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@asyncapi/react-component",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "private": false,
   "description": "A React component for AsyncAPI specification.",
   "repository": {
@@ -71,7 +71,7 @@
     "@asyncapi/avro-schema-parser": "3.0.3",
     "@asyncapi/openapi-schema-parser": "3.0.4",
     "@asyncapi/protobuf-schema-parser": "3.0.0",
-    "@asyncapi/parser": "^3.0.0-next-major-spec.1",
+    "@asyncapi/parser": "^3.0.0-next-major-spec.3",
     "highlight.js": "^10.7.2",
     "isomorphic-dompurify": "^0.13.0",
     "marked": "^4.0.14",

diff --git a/library/src/containers/AsyncApi/Standalone.tsx b/library/src/containers/AsyncApi/Standalone.tsx
@@ -32,7 +32,6 @@ class AsyncApiComponent extends Component<AsyncApiProps, AsyncAPIState> {
     if (parsedSpec) {
       this.state = { asyncapi: parsedSpec };
     }
-    return;
   }
 
   async componentDidMount() {

diff --git a/library/src/containers/Servers/Security.tsx b/library/src/containers/Servers/Security.tsx
@@ -26,8 +26,7 @@ export const Security: React.FunctionComponent<Props> = ({
 
   let renderedSecurities;
   if (
-    !security ||
-    !security.length ||
+    !security?.length ||
     !securitySchemes ||
     !Object.keys(securitySchemes).length
   ) {
@@ -276,7 +275,7 @@ const SecurityItem: React.FunctionComponent<SecurityItemProps> = ({
         </div>
       )}
 
-      {securitySchema && securitySchema.hasDescription() && (
+      {securitySchema?.hasDescription() && (
         <div>
           <Markdown>{securitySchema.description()}</Markdown>
         </div>

diff --git a/library/src/helpers/message.ts b/library/src/helpers/message.ts
@@ -53,10 +53,9 @@ export class MessageHelpers {
     }
 
     const payload = msg.payload();
-    if (payload && payload.examples()) {
+    if (payload?.examples()) {
       return payload.examples()?.map(example => ({ example }));
     }
-
     return;
   }
 
@@ -84,10 +83,9 @@ export class MessageHelpers {
     }
 
     const headers = msg.headers();
-    if (headers && headers.examples()) {
+    if (headers?.examples()) {
       return headers.examples()?.map(example => ({ example }));
     }
-
-    return;
+    return undefined;
   }
 }
diff --git a/library/src/helpers/server.ts b/library/src/helpers/server.ts
@@ -59,13 +59,12 @@ export class ServerHelpers {
       } else {
         securityProtocol = 'PLAINTEXT';
       }
+    } else if (securitySchema) {
+      securityProtocol = 'SASL_SSL';
     } else {
-      if (securitySchema) {
-        securityProtocol = 'SASL_SSL';
-      } else {
-        securityProtocol = 'SSL';
-      }
+      securityProtocol = 'SSL';
     }
+
     if (securitySchema) {
       switch (securitySchema.type()) {
         case 'plain':

diff --git a/library/src/styles/default.css b/library/src/styles/default.css
@@ -9,16 +9,10 @@
     @apply lg:hidden;
   }
 
-  .container\:xl .burger-menu {
-  }
-
   .container\:base .sidebar {
     @apply lg:relative lg:block lg:w-64 lg:h-auto;
   }
 
-  .container\:xl .sidebar {
-  }
-
   .container\:base .sidebar--content {
     @apply lg:w-56;
   }
@@ -57,9 +51,6 @@
     @apply 2xl:p-0 2xl:mt-0;
   }
 
-  .container\:xl .examples {
-  }
-
   .container\:base .panel--right {
     @apply hidden 2xl:block 2xl:w-5/12;
   }

diff --git a/playground/package-lock.json b/playground/package-lock.json
diff --git a/playground/package.json b/playground/package.json
@@ -4,7 +4,7 @@
   "description": "Playground app for AsyncApi React Component",
   "homepage": "https://asyncapi.github.io/asyncapi-react",
   "dependencies": {
-    "@asyncapi/react-component": "^1.0.1",
+    "@asyncapi/react-component": "^1.0.2",
     "@fortawesome/fontawesome-svg-core": "^1.2.22",
     "@fortawesome/free-brands-svg-icons": "^5.10.2",
     "@fortawesome/free-solid-svg-icons": "^5.10.2",
@@ -45,5 +45,5 @@
       "last 1 safari version"
     ]
   },
-  "version": "1.0.1"
+  "version": "1.0.2"
 }
diff --git a/web-component/package-lock.json b/web-component/package-lock.json
-Original file line number
+Diff line change
@@ Expand Up @@
         if (parsedSpec) {
           this.state = { asyncapi: parsedSpec };
         }
-        return;
       }
       async componentDidMount() {
@@ Expand Down @@