save

levkk · levkk · commit ba0ecabff2b1 · 2024-04-04T15:35:10.000-07:00
diff --git a/pgml-dashboard/Cargo.lock b/pgml-dashboard/Cargo.lock
diff --git a/pgml-dashboard/src/components/global/preserve_scroll/preserve_scroll_controller.js b/pgml-dashboard/src/components/global/preserve_scroll/preserve_scroll_controller.js
@@ -1,22 +1,22 @@
-import { Controller } from '@hotwired/stimulus'
+import { Controller } from "@hotwired/stimulus";
 
 export default class extends Controller {
-  static initialized = false
+  static initialized = false;
 
   initialize() {
-    if (this.constructor.initialized) return
+    if (this.constructor.initialized) return;
 
-    window.addEventListener("turbo:before-visit", function(event) {
-        localStorage.setItem('scrollpos', window.scrollY);
+    window.addEventListener("turbo:before-visit", function (event) {
+      localStorage.setItem("scrollpos", window.scrollY);
     });
 
-    window.addEventListener("turbo:load", function(event) {
-      const scrollpos = localStorage.getItem('scrollpos');
+    window.addEventListener("turbo:load", function (event) {
+      const scrollpos = localStorage.getItem("scrollpos");
       if (scrollpos) {
         window.scrollTo(0, scrollpos);
       }
-    })
+    });
 
-    this.constructor.initialized = true
+    this.constructor.initialized = true;
   }
 }
diff --git a/pgml-dashboard/src/components/inputs/switch_v_2/switch_v_2_controller.js b/pgml-dashboard/src/components/inputs/switch_v_2/switch_v_2_controller.js
@@ -1,7 +1,7 @@
 import { Controller } from "@hotwired/stimulus";
 
 export default class extends Controller {
-  static targets = ["button", "link"];
+  static targets = ["button"];
 
   selectSwitchOption(e) {
     this.buttonTargets.forEach((target) => {
@@ -12,8 +12,10 @@ export default class extends Controller {
     e.currentTarget.classList.add("active");
     e.currentTarget.ariaPressed = true;
 
-    if (this.hasLinkTarget) {
-      this.linkTarget.click()
+    const link = e.currentTarget.querySelector("a");
+
+    if (link) {
+      link.click();
     }
   }
 }
diff --git a/pgml-dashboard/src/components/inputs/switch_v_2/template.html b/pgml-dashboard/src/components/inputs/switch_v_2/template.html
@@ -16,9 +16,9 @@
         data-action="<%= option.actions %>"
         >
           <% if let Some(ref link) = option.link { %>
-          <a href="<%= link %>" class="d-none" data-inputs-switch-v-2-target="link"></a>
+          <a href="<%= link %>" class="d-none"></a>
           <% } %>
-        
+
           <% if let Some(icon) = option.icon { %>
           <span class="material-symbols-outlined">
             <%= icon %>

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import { Controller } from "@hotwired/stimulus";`
`2`	`2`
`3`	`3`	`export default class extends Controller {`
`4`		`- static targets = ["button", "link"];`
	`4`	`+ static targets = ["button"];`
`5`	`5`
`6`	`6`	`selectSwitchOption(e) {`
`7`	`7`	`this.buttonTargets.forEach((target) => {`
`@@ -12,8 +12,10 @@ export default class extends Controller {`
`12`	`12`	`e.currentTarget.classList.add("active");`
`13`	`13`	`e.currentTarget.ariaPressed = true;`
`14`	`14`
`15`		`- if (this.hasLinkTarget) {`
`16`		`- this.linkTarget.click()`
	`15`	`+ const link = e.currentTarget.querySelector("a");`
	`16`	`+`
	`17`	`+ if (link) {`
	`18`	`+ link.click();`
`17`	`19`	`}`
`18`	`20`	`}`
`19`	`21`	`}`