Cleanup

anderly · anderly · commit b961b7981aa4 · 2023-02-08T17:10:07.000-06:00
diff --git a/dist/js/card.js b/dist/js/card.js
@@ -81,15 +81,9 @@ __webpack_require__.r(__webpack_exports__);
           _this.copied = false;
         }, 2000);
       }
-    },
-    navigateToMetricLink: function navigateToMetricLink(e) {
-      Nova.visit(this.link);
     }
   },
   computed: {
-    link: function link() {
-      return JSON.parse(this.url);
-    },
     growthPercentage: function growthPercentage() {
       return Math.abs(this.increaseOrDecrease);
     },
@@ -386,6 +380,7 @@ var _hoisted_19 = {
 function render(_ctx, _cache, $props, $setup, $data, $options) {
   var _this = this;
   var _component_HelpTextTooltip = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)("HelpTextTooltip");
+  var _component_SelectControl = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)("SelectControl");
   var _component_Icon = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)("Icon");
   var _component_Link = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)("Link");
   var _component_LoadingCard = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)("LoadingCard");
@@ -398,7 +393,14 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
       return [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("div", _hoisted_1, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("h3", _hoisted_2, (0,vue__WEBPACK_IMPORTED_MODULE_0__.toDisplayString)($props.title), 1 /* TEXT */), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_HelpTextTooltip, {
         text: $props.helpText,
         width: $props.helpWidth
-      }, null, 8 /* PROPS */, ["text", "width"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createCommentVNode)(" <SelectControl\n          v-if=\"ranges.length > 0\"\n          class=\"ml-auto w-[6rem] flex-shrink-0\"\n          size=\"xxs\"\n          :options=\"ranges\"\n          v-model:selected=\"selectedRangeKey\"\n          @change=\"handleChange\"\n          :aria-label=\"__('Select Ranges')\"\n        /> ")]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("div", _hoisted_3, [$props.icon ? ((0,vue__WEBPACK_IMPORTED_MODULE_0__.openBlock)(), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementBlock)("div", _hoisted_4, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_Icon, {
+      }, null, 8 /* PROPS */, ["text", "width"]), $props.ranges.length > 0 ? ((0,vue__WEBPACK_IMPORTED_MODULE_0__.openBlock)(), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createBlock)(_component_SelectControl, {
+        key: 0,
+        "class": "ml-auto w-[6rem] flex-shrink-0",
+        size: "xxs",
+        options: $props.ranges,
+        onChange: $options.handleChange,
+        "aria-label": _ctx.__('Select Ranges')
+      }, null, 8 /* PROPS */, ["options", "onChange", "aria-label"])) : (0,vue__WEBPACK_IMPORTED_MODULE_0__.createCommentVNode)("v-if", true)]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("div", _hoisted_3, [$props.icon ? ((0,vue__WEBPACK_IMPORTED_MODULE_0__.openBlock)(), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementBlock)("div", _hoisted_4, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_Icon, {
         type: $props.icon,
         width: "24",
         height: "24"
@@ -408,7 +410,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
         rounded: false
       }, {
         "default": (0,vue__WEBPACK_IMPORTED_MODULE_0__.withCtx)(function () {
-          return [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createCommentVNode)(" <a @click.stop.prevent=\"navigateToMetricLink\"> "), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_Link, {
+          return [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_Link, {
             href: _this.url,
             title: $props.title,
             "class": "link-default font-normal"
@@ -417,7 +419,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
               return [(0,vue__WEBPACK_IMPORTED_MODULE_0__.withDirectives)(((0,vue__WEBPACK_IMPORTED_MODULE_0__.openBlock)(), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementBlock)("span", null, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createTextVNode)((0,vue__WEBPACK_IMPORTED_MODULE_0__.toDisplayString)($options.formattedValue), 1 /* TEXT */)])), [[_directive_tooltip, "".concat($options.tooltipFormattedValue)]])];
             }),
             _: 1 /* STABLE */
-          }, 8 /* PROPS */, ["href", "title"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createCommentVNode)(" </a> "), $props.suffix ? ((0,vue__WEBPACK_IMPORTED_MODULE_0__.openBlock)(), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementBlock)("span", _hoisted_5, (0,vue__WEBPACK_IMPORTED_MODULE_0__.toDisplayString)($options.formattedSuffix), 1 /* TEXT */)) : (0,vue__WEBPACK_IMPORTED_MODULE_0__.createCommentVNode)("v-if", true)];
+          }, 8 /* PROPS */, ["href", "title"]), $props.suffix ? ((0,vue__WEBPACK_IMPORTED_MODULE_0__.openBlock)(), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementBlock)("span", _hoisted_5, (0,vue__WEBPACK_IMPORTED_MODULE_0__.toDisplayString)($options.formattedSuffix), 1 /* TEXT */)) : (0,vue__WEBPACK_IMPORTED_MODULE_0__.createCommentVNode)("v-if", true)];
         }),
         _: 1 /* STABLE */
       }, 8 /* PROPS */, ["onClick"])), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("div", null, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("p", _hoisted_6, [$options.increaseOrDecreaseLabel == 'Decrease' ? ((0,vue__WEBPACK_IMPORTED_MODULE_0__.openBlock)(), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementBlock)("svg", _hoisted_7, _hoisted_9)) : (0,vue__WEBPACK_IMPORTED_MODULE_0__.createCommentVNode)("v-if", true), $options.increaseOrDecreaseLabel == 'Increase' ? ((0,vue__WEBPACK_IMPORTED_MODULE_0__.openBlock)(), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementBlock)("svg", _hoisted_10, _hoisted_12)) : (0,vue__WEBPACK_IMPORTED_MODULE_0__.createCommentVNode)("v-if", true), $options.increaseOrDecrease != 0 ? ((0,vue__WEBPACK_IMPORTED_MODULE_0__.openBlock)(), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementBlock)("span", _hoisted_13, [$options.growthPercentage !== 0 ? ((0,vue__WEBPACK_IMPORTED_MODULE_0__.openBlock)(), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementBlock)("span", _hoisted_14, (0,vue__WEBPACK_IMPORTED_MODULE_0__.toDisplayString)($options.growthPercentage) + "% " + (0,vue__WEBPACK_IMPORTED_MODULE_0__.toDisplayString)(_ctx.__($options.increaseOrDecreaseLabel)), 1 /* TEXT */)) : ((0,vue__WEBPACK_IMPORTED_MODULE_0__.openBlock)(), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementBlock)("span", _hoisted_15, (0,vue__WEBPACK_IMPORTED_MODULE_0__.toDisplayString)(_ctx.__('No Increase')), 1 /* TEXT */))])) : ((0,vue__WEBPACK_IMPORTED_MODULE_0__.openBlock)(), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementBlock)("span", _hoisted_16, [$props.previous == '0' && $props.value != '0' ? ((0,vue__WEBPACK_IMPORTED_MODULE_0__.openBlock)(), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementBlock)("span", _hoisted_17, (0,vue__WEBPACK_IMPORTED_MODULE_0__.toDisplayString)(_ctx.__('No Prior Data')), 1 /* TEXT */)) : (0,vue__WEBPACK_IMPORTED_MODULE_0__.createCommentVNode)("v-if", true), $props.value == '0' && $props.previous != '0' && !$props.zeroResult ? ((0,vue__WEBPACK_IMPORTED_MODULE_0__.openBlock)(), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementBlock)("span", _hoisted_18, (0,vue__WEBPACK_IMPORTED_MODULE_0__.toDisplayString)(_ctx.__('No Current Data')), 1 /* TEXT */)) : (0,vue__WEBPACK_IMPORTED_MODULE_0__.createCommentVNode)("v-if", true), $props.value == '0' && $props.previous == '0' && !$props.zeroResult ? ((0,vue__WEBPACK_IMPORTED_MODULE_0__.openBlock)(), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementBlock)("span", _hoisted_19, (0,vue__WEBPACK_IMPORTED_MODULE_0__.toDisplayString)(_ctx.__('No Data')), 1 /* TEXT */)) : (0,vue__WEBPACK_IMPORTED_MODULE_0__.createCommentVNode)("v-if", true)]))])])])])];
diff --git a/resources/js/components/Base/BaseValueMetric.vue b/resources/js/components/Base/BaseValueMetric.vue
@@ -5,15 +5,15 @@
 
         <HelpTextTooltip :text="helpText" :width="helpWidth" />
 
-        <!-- <SelectControl
+        <SelectControl
           v-if="ranges.length > 0"
           class="ml-auto w-[6rem] flex-shrink-0"
           size="xxs"
           :options="ranges"
           v-model:selected="selectedRangeKey"
           @change="handleChange"
           :aria-label="__('Select Ranges')"
-        /> -->
+        />
       </div>
 
       <div class="flex items-center mb-4 space-x-4">
@@ -31,13 +31,11 @@
             class="flex items-center text-4xl"
             :rounded="false"
           >
-            <!-- <a @click.stop.prevent="navigateToMetricLink"> -->
-              <Link :href="this.url" :title="title" class="link-default font-normal">
-                <span v-tooltip="`${tooltipFormattedValue}`">
-                {{ formattedValue }}
-                </span>
-              </Link>
-            <!-- </a> -->
+            <Link :href="this.url" :title="title" class="link-default font-normal">
+              <span v-tooltip="`${tooltipFormattedValue}`">
+              {{ formattedValue }}
+              </span>
+            </Link>
             <span v-if="suffix" class="ml-2 text-sm font-bold">
               {{ formattedSuffix }}
             </span>
@@ -160,15 +158,9 @@
         }
       },
 
-      navigateToMetricLink(e) {
-        Nova.visit(this.link)
-      },
     },
 
     computed: {
-      link() {
-          return JSON.parse(this.url);
-      },
 
       growthPercentage() {
         return Math.abs(this.increaseOrDecrease)
