diff --git a/package.json b/package.json index 4d78dd1..6424e41 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,9 @@ { "name": "openmct-mcws", - "version": "5.2.0-rc1", + "version": "5.2.0-rc2", "description": "Open MCT for MCWS", "devDependencies": { + "@braintree/sanitize-url": "6.0.2", "axios": "^0.21.2", "babel-loader": "8.2.3", "babel-plugin-istanbul": "6.1.1", @@ -31,7 +32,7 @@ "mini-css-extract-plugin": "2.6.0", "moment": "2.29.4", "node-bourbon": "^4.2.3", - "openmct": "nasa/openmct#omm-r5.2.0-rc1", + "openmct": "nasa/openmct#omm-r5.2.0-rc2", "openmct-legacy-support": "akhenry/openmct-legacy-support#omm-r5.1.0-rc1", "printj": "^1.2.1", "raw-loader": "^0.5.1", diff --git a/pom.xml b/pom.xml index 3fd33df..7582a5f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ gov.nasa.arc.wtd openmct-client Open MCT for MCWS Client - 5.2.0-rc1 + 5.2.0-rc2 war diff --git a/src/identity/LoginService.js b/src/identity/LoginService.js index 7e27653..0fae4a9 100644 --- a/src/identity/LoginService.js +++ b/src/identity/LoginService.js @@ -1,9 +1,7 @@ /*global define*/ define( - [ - './login.html' - ], - function (loginTemplate) { + [], + function () { /** @@ -48,9 +46,13 @@ define( LoginService.prototype.show = function () { this.overlay = document.createElement('div'); this.overlay.classList.add('u-contents'); - this.overlay.innerHTML = loginTemplate; + + const iframe = document.createElement('iframe'); + iframe.classList.add('c-login-overlay'); + iframe.src = this.getLoginUrl(); + + this.overlay.appendChild(iframe); document.body.appendChild(this.overlay); - this.overlay.querySelector('iframe').src = this.getLoginUrl(); }; /** diff --git a/src/identity/login.html b/src/identity/login.html deleted file mode 100644 index 9799db4..0000000 --- a/src/identity/login.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/link/plugin.js b/src/link/plugin.js index 1b2a53a..fb17b3e 100644 --- a/src/link/plugin.js +++ b/src/link/plugin.js @@ -1,7 +1,7 @@ define([ - + '@braintree/sanitize-url' ], function ( - + urlSanitizeLib ) { function LinkPlugin() { @@ -32,7 +32,13 @@ define([ view: function (domainObject) { return { show: function (container) { - container.innerHTML = '' + domainObject.name + '' + container.textContent = ''; + + const anchor = document.createElement('a'); + anchor.href = urlSanitizeLib.sanitizeUrl(domainObject.url); + anchor.textContent = domainObject.name; + + container.appendChild(anchor); }, destroy: function () {} };