Merge pull request #33 from advanced-rest-client/fix-url

Fix url

Author: carowright

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@api-components/api-method-documentation",
   "description": "A HTTP method documentation build from AMF model",
-  "version": "5.1.7",
+  "version": "5.1.8",
   "license": "Apache-2.0",
   "main": "api-method-documentation.js",
   "keywords": [

package.json

@@ -191,15 +191,15 @@ export class ApiUrl extends AmfHelperMixin(LitElement) {
   }
 
   _getPathTemplate() {
-    if (this.isNotHttp) {
+    if (this.isNotHttp && !!this._method) {
       return html`<div class="url-channel-value"><span class="channel-url">Channel</span>${this.path}</div>`;
     }
     return undefined;
   }
 
   getUrlTemplate() {
-    const { url, isNotHttp } = this;
-    if (isNotHttp) {
+    const { url, isNotHttp, _method } = this;
+    if (isNotHttp && !!_method) {
       return html`<div class="url-server-value"><span class="server-url">Server</span>${url}</div>`
     }
     return html`${url}`

src/ApiUrl.js

@@ -131,7 +131,7 @@ describe('<api-url>', function () {
 
 			beforeEach(async () => {
 				const endpointName = 'smartylighting/streetlights/1/0/event/{streetlightId}/lighting/measured'
-				const [endpoint, operation] = AmfLoader.lookupEndpointOperation(amf, endpointName, 'subscribe');
+				const [endpoint, operation] = AmfLoader.lookupEndpointOperation(amf, endpointName, 'kafka');
 				element = await basicFixture();
 				element.amf = amf;
 				server = AmfLoader.getEncodes(amf)[element._getAmfKey(element.ns.aml.vocabularies.apiContract.server)];
@@ -152,6 +152,17 @@ describe('<api-url>', function () {
 				const server = 'Servermqtt://api.streetlights.smartylighting.com:{port}'
 				assert.equal(element.shadowRoot.querySelector('.url-server-value').textContent, server);
 			});
+
+			it('should only render url value when no operation selected', async () => {
+				element.amf = amf
+				element.operation = undefined
+				element.endpoint = undefined
+				await nextFrame();
+				await nextFrame();
+
+				const url = 'mqtt://api.streetlights.smartylighting.com:{port}'
+				assert.equal(element.shadowRoot.querySelector('.url-value').textContent.trim(), url);
+			});
 		});
 	});
   });