Add back urlDefined and remove null checks

nasa · Oct 7, 2021 · abc93d0 · abc93d0
1 parent a9daee1
commit abc93d0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 25 deletions.
diff --git a/src/plugins/conditionWidget/components/ConditionWidget.vue b/src/plugins/conditionWidget/components/ConditionWidget.vue
@@ -42,14 +42,11 @@ export default {
         };
     },
     computed: {
+        urlDefined() {
+            return this.internalDomainObject.url && this.internalDomainObject.url.length > 0;
+        },
         url() {
-            const urlDefined = this.internalDomainObject.url && this.internalDomainObject.url.length > 0;
-            let url = urlDefined ? this.internalDomainObject.url : null;
-            if (url) {
-                url = sanitizeUrl(url);
-            }
-
-            return url;
+            return this.urlDefined ? sanitizeUrl(this.internalDomainObject.url) : null;
         }
     },
     mounted() {

diff --git a/src/plugins/hyperlink/HyperlinkLayout.vue b/src/plugins/hyperlink/HyperlinkLayout.vue
@@ -48,12 +48,7 @@ export default {
             return true;
         },
         url() {
-            let url = this.domainObject.url;
-            if (url) {
-                url = sanitizeUrl(url);
-            }
-
-            return url;
+            return sanitizeUrl(this.domainObject.url);
         }
     }
 };

diff --git a/src/plugins/summaryWidget/src/SummaryWidget.js b/src/plugins/summaryWidget/src/SummaryWidget.js
@@ -116,9 +116,7 @@ define([
      */
     SummaryWidget.prototype.addHyperlink = function (url, openNewTab) {
         if (url) {
-            const sanitizeUrl = urlSanitizeLib.sanitizeUrl;
-            url = sanitizeUrl(url);
-            this.widgetButton.attr('href', url);
+            this.widgetButton.attr('href', urlSanitizeLib.sanitizeUrl(url));
         } else {
             this.widgetButton.removeAttr('href');
         }

diff --git a/src/plugins/summaryWidget/src/views/SummaryWidgetView.js b/src/plugins/summaryWidget/src/views/SummaryWidgetView.js
@@ -39,9 +39,7 @@ define([
 
         let url = this.domainObject.url;
         if (url) {
-            const sanitizeUrl = urlSanitizeLib.sanitizeUrl;
-            url = sanitizeUrl(url);
-            this.widget.setAttribute('href', url);
+            this.widget.setAttribute('href', urlSanitizeLib.sanitizeUrl(url));
         } else {
             this.widget.removeAttribute('href');
         }

diff --git a/src/plugins/webPage/components/WebPage.vue b/src/plugins/webPage/components/WebPage.vue
@@ -16,12 +16,7 @@ export default {
     },
     computed: {
         url() {
-            let url = this.currentDomainObject.url;
-            if (url) {
-                url = sanitizeUrl(url);
-            }
-
-            return url;
+            return sanitizeUrl(this.currentDomainObject.url);
         }
     }
 };