Fix ci

xdan · Apr 22, 2024 · 8390840 · 8390840
1 parent 7df5ef8
commit 8390840
Show file tree

Hide file tree

Showing 6 changed files with 225 additions and 142 deletions.
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -9,16 +9,16 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3 #Setup Node
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4 #Setup Node
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'
       - run: npm ci --legacy-peer-deps
       - run: make build
       - run: make examples
       - name: Upload Pages artifact
-        uses: actions/upload-pages-artifact@v2
+        uses: actions/upload-pages-artifact@v3
         with:
           path: ./examples
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,8 +10,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3 #Setup Node
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4 #Setup Node
       with:
         node-version-file: '.nvmrc'
         cache: 'npm'

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,8 +12,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3 #Setup Node
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4 #Setup Node
       with:
         node-version-file: '.nvmrc'
         cache: 'npm'

diff --git a/Makefile b/Makefile
@@ -206,7 +206,7 @@ test-find find-test:
 	$(TS_NODE_BASE) $(cwd)tools/utils/find-tests.ts
 
 .PHONY: test-only-run test-run-only
-test-only-run:
+test-only-run test-run-only:
 	$(KARMA) --browsers $(browsers) $(cwd)tools/karma.conf.ts --single-run $(singleRun) --build=$(build) --min=$(uglify) --fat=$(fat) --cwd=$(pwd)
 
 .PHONY: coverage

diff --git a/src/modules/file-browser/file-browser.ts b/src/modules/file-browser/file-browser.ts
@@ -280,7 +280,14 @@ export class FileBrowser extends ViewWithToolbar implements IFileBrowser, Dlgs {
 
 				this.e.fire('sort.filebrowser', this.state.sortBy);
 
-				loadTree(this).then(resolve, reject);
+				loadTree(this)
+					.then(resolve, reject)
+					.finally(() => {
+						if (this.isInDestruct) {
+							return;
+						}
+						this?.e?.fire('fileBrowserReady.filebrowser');
+					});
 			})
 			.catch((e: Error): void => {
 				if (!IS_PROD) {