Move destroy handler registration in with-copyable

hashicorp · Oct 16, 2023 · 0519b9b · 0519b9b
1 parent 0fd98e7
commit 0519b9b
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/ui/packages/consul-ui/app/modifiers/with-copyable.js b/ui/packages/consul-ui/app/modifiers/with-copyable.js
@@ -12,7 +12,7 @@ const typeAssertion = (type, value, withDefault) => {
 };
 
 function cleanup(instance) {
-  if (instance?.source && instance?.hash) {
+  if (instance && instance?.source && instance?.hash) {
     instance.source?.off('success', instance.hash.success)?.off('error', instance.hash.error);
 
     instance.source?.destroy();
@@ -49,11 +49,15 @@ export default class WithCopyableModifier extends Modifier {
     this.hash = hash;
   }
 
+  constructor() {
+    super(...arguments);
+    registerDestructor(this, cleanup);
+  }
+
   modify(element, [value], namedArgs) {
     this.element = element;
     this.disconnect();
     this.connect(value, namedArgs);
-    registerDestructor(this, cleanup);
   }
 
   disconnect() {