Merge pull request #573 from uploadcare/fix/dashboard-related-fixes

Fix/dashboard related fixes
uploadcare · Dec 7, 2023 · 0757f42 · 0757f42
2 parents 32003cb + 34dd6c6
commit 0757f42
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 14 deletions.
diff --git a/abstract/ActivityBlock.js b/abstract/ActivityBlock.js
@@ -60,11 +60,14 @@ export class ActivityBlock extends Block {
           this.$['*history'] = [];
         }
       });
-      this.sub('*modalActive', (modalActive) => {
-        if (!modalActive && this.activityType === this.$['*currentActivity']) {
-          this.$['*currentActivity'] = null;
-        }
-      });
+
+      if (this.has('*modalActive')) {
+        this.sub('*modalActive', (modalActive) => {
+          if (!modalActive && this.activityType === this.$['*currentActivity']) {
+            this.$['*currentActivity'] = null;
+          }
+        });
+      }
     }
   }
 

diff --git a/abstract/Block.js b/abstract/Block.js
@@ -196,11 +196,19 @@ export class Block extends BaseComponent {
     Data.deleteCtx(this);
 
     if (blocksRegistry.size === 0) {
-      // Destroy external context if there is no any blocks left inside it
-      Data.deleteCtx(this.ctxName);
+      this.destroyCtxCallback();
     }
   }
 
+  /**
+   * Called when the last block is removed from the context. Note that inheritors must run their callback before that.
+   *
+   * @protected
+   */
+  destroyCtxCallback() {
+    Data.deleteCtx(this.ctxName);
+  }
+
   /**
    * @param {Number} bytes
    * @param {Number} [decimals]

diff --git a/abstract/CTX.js b/abstract/CTX.js
@@ -32,4 +32,5 @@ export const uploaderBlockCtx = (fnCtx) => ({
   '*focusedEntry': null,
   '*uploadMetadata': null,
   '*uploadQueue': new Queue(1),
+  '*uploadCollection': null,
 });
diff --git a/abstract/UploaderBlock.js b/abstract/UploaderBlock.js
@@ -70,7 +70,7 @@ export class UploaderBlock extends ActivityBlock {
   initCallback() {
     super.initCallback();
 
-    if (!this.has('*uploadCollection')) {
+    if (!this.$['*uploadCollection']) {
       let uploadCollection = new TypedCollection({
         typedSchema: uploadEntrySchema,
         watchList: [
@@ -82,7 +82,7 @@ export class UploaderBlock extends ActivityBlock {
           'cdnUrlModifiers',
         ],
       });
-      this.add('*uploadCollection', uploadCollection);
+      this.$['*uploadCollection'] = uploadCollection;
     }
 
     if (!this.hasCtxOwner && this.couldBeCtxOwner) {
@@ -92,11 +92,15 @@ export class UploaderBlock extends ActivityBlock {
 
   destroyCallback() {
     super.destroyCallback();
-    if (this.isCtxOwner) {
-      this._unobserveCollectionProperties?.();
-      this._unobserveCollection?.();
-      this.uploadCollection.destroy();
-    }
+  }
+
+  destroyCtxCallback() {
+    this._unobserveCollectionProperties?.();
+    this._unobserveCollection?.();
+    this.uploadCollection.destroy();
+    this.$['*uploadCollection'] = null;
+
+    super.destroyCtxCallback();
   }
 
   initCtxOwner() {