Skip to content

Commit

Permalink
Merge pull request #505 from q-masters/development
Browse files Browse the repository at this point in the history
Release 1.1.0
  • Loading branch information
konne authored Sep 10, 2020
2 parents 3151d92 + 90a988c commit 2727c43
Show file tree
Hide file tree
Showing 6 changed files with 83 additions and 15 deletions.
12 changes: 6 additions & 6 deletions src/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
72 changes: 69 additions & 3 deletions src/projects/media/webview/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/projects/media/webview/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down

0 comments on commit 2727c43

Please sign in to comment.