diff --git a/src/package-lock.json b/src/package-lock.json index 2e26295fa..bc944ecaf 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -4497,9 +4497,9 @@ } }, "node-fetch": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", - "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" }, "node-libs-browser": { "version": "2.2.1", @@ -5408,9 +5408,9 @@ } }, "rxjs": { - "version": "6.6.2", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz", - "integrity": "sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==", + "version": "6.6.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz", + "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==", "requires": { "tslib": "^1.9.0" } diff --git a/src/package.json b/src/package.json index 30e801407..fa45775ee 100644 --- a/src/package.json +++ b/src/package.json @@ -186,11 +186,11 @@ "dependencies": { "enigma.js": "2.7.2", "lodash": "^4.17.20", - "node-fetch": "^2.6.0", + "node-fetch": "^2.6.1", "object-hash": "2.0.3", "reflect-metadata": "^0.1.13", "request": "2.88.2", - "rxjs": "^6.6.2", + "rxjs": "^6.6.3", "tsyringe": "^4.3.0", "ws": "7.3.1", "yaml": "1.10.0" diff --git a/src/projects/extension/file-system/entry/application/app-list.stream.directory.ts b/src/projects/extension/file-system/entry/application/app-list.stream.directory.ts index 324a147d4..6d6d2c651 100644 --- a/src/projects/extension/file-system/entry/application/app-list.stream.directory.ts +++ b/src/projects/extension/file-system/entry/application/app-list.stream.directory.ts @@ -10,10 +10,13 @@ import { Connection } from "projects/extension/connection/utils/connection"; export class AppListStreamDirectory extends AppListDirectory { protected onAppsLoaded(apps: DoclistEntry[], connection: Connection, uri: vscode.Uri): DoclistEntry[] { + const stream = connection.fileSystem.read(uri.toString(true)); if (!stream) { return []; } - return apps.filter((app) => app.qMeta.stream?.id === stream.id); + const result = apps.filter((app) => app.qMeta.stream?.id === stream.id); + + return result; } } diff --git a/src/projects/extension/file-system/entry/streams.directory.ts b/src/projects/extension/file-system/entry/streams.directory.ts index e6d64fc87..2509afa99 100644 --- a/src/projects/extension/file-system/entry/streams.directory.ts +++ b/src/projects/extension/file-system/entry/streams.directory.ts @@ -31,8 +31,7 @@ export class QixFsStreamRootDirectory extends QixFsDirectoryAdapter { /** register to cache ? */ return this.sanitizeStreams(streams).map((stream) => { - const streamUri = uri.with({path: resolve(uri.path, stream.qName)}); - + const streamUri = uri.with({path: uri.path + '/' + stream.qName}); connection.fileSystem.write(streamUri.toString(true), { id: stream.qId, name: stream.qName, diff --git a/src/projects/media/webview/package-lock.json b/src/projects/media/webview/package-lock.json index 49443e0db..1c615c393 100644 --- a/src/projects/media/webview/package-lock.json +++ b/src/projects/media/webview/package-lock.json @@ -12,6 +12,23 @@ "requires": { "@angular-devkit/core": "10.1.0", "rxjs": "6.6.2" + }, + "dependencies": { + "rxjs": { + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz", + "integrity": "sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", + "dev": true + } } }, "@angular-devkit/build-angular": { @@ -197,6 +214,23 @@ "requires": { "@angular-devkit/architect": "0.1001.0", "rxjs": "6.6.2" + }, + "dependencies": { + "rxjs": { + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz", + "integrity": "sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", + "dev": true + } } }, "@angular-devkit/build-optimizer": { @@ -330,6 +364,21 @@ "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", "dev": true + }, + "rxjs": { + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz", + "integrity": "sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", + "dev": true } } }, @@ -342,6 +391,23 @@ "@angular-devkit/core": "10.1.0", "ora": "5.0.0", "rxjs": "6.6.2" + }, + "dependencies": { + "rxjs": { + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz", + "integrity": "sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", + "dev": true + } } }, "@angular/animations": { @@ -11444,9 +11510,9 @@ } }, "rxjs": { - "version": "6.6.2", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz", - "integrity": "sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==", + "version": "6.6.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz", + "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==", "requires": { "tslib": "^1.9.0" }, diff --git a/src/projects/media/webview/package.json b/src/projects/media/webview/package.json index 552d76f62..cf756ae87 100644 --- a/src/projects/media/webview/package.json +++ b/src/projects/media/webview/package.json @@ -21,7 +21,7 @@ "@angular/platform-browser-dynamic": "10.0.2", "@angular/router": "10.0.2", "history": "5.0.0", - "rxjs": "6.6.2", + "rxjs": "6.6.3", "tslib": "^2.0.1", "zone.js": "0.10.3" },