rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/3.5.10'

Browse Source
This commit is contained in:
Baptiste Grob
2020-11-25 19:31:38 +01:00
parent 15f776e83b 0fc65ec5f0
commit 1e73fdf132
4 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/services/errorReporting.ts
View File

@@ -4,6 +4,11 @@ import { storage, StorageKey } from './localStorage';
import Bugsnag from '@bugsnag/js'; import Bugsnag from '@bugsnag/js';
declare const __VERSION__: string; declare const __VERSION__: string;
declare global {
interface Window {
_bugsnag_api_key?: string;
}
}
function redactFilePath(line: string): string { function redactFilePath(line: string): string {
const fileName = line.match(/\w+\.(html|js)/)?.[0]; const fileName = line.match(/\w+\.(html|js)/)?.[0];
@@ -16,13 +21,16 @@ function redactFilePath(line: string): string {
} }
export function startErrorReporting() { export function startErrorReporting() {
if (storage.get(StorageKey.DisableErrorReporting)) { if (
storage.get(StorageKey.DisableErrorReporting) ||
!window._bugsnag_api_key
) {
SNLog.onError = console.error; SNLog.onError = console.error;
return; return;
} }
try { try {
Bugsnag.start({ Bugsnag.start({
apiKey: (window as any)._bugsnag_api_key, apiKey: window._bugsnag_api_key,
appType: isDesktopApplication() ? 'desktop' : 'web', appType: isDesktopApplication() ? 'desktop' : 'web',
appVersion: __VERSION__, appVersion: __VERSION__,
collectUserIp: false, collectUserIp: false,

13
app/assets/javascripts/views/tags/tags_view.ts
View File

@@ -103,17 +103,6 @@ class TagsViewCtrl extends PureViewCtrl<{}, TagState> {
this.reloadNoteCounts(); this.reloadNoteCounts();
} }
/**
* Returns all officially saved tags as reported by the model manager.
* @access private
*/
getMappedTags() {
const tags = this.application.getItems(ContentType.Tag) as SNTag[];
return tags.sort((a, b) => {
return a.title < b.title ? -1 : 1;
});
}
beginStreamingItems() { beginStreamingItems() {
this.removeFoldersObserver = this.application.streamItems( this.removeFoldersObserver = this.application.streamItems(
[ContentType.Component], [ContentType.Component],
@@ -126,7 +115,7 @@ class TagsViewCtrl extends PureViewCtrl<{}, TagState> {
[ContentType.Tag, ContentType.SmartTag], [ContentType.Tag, ContentType.SmartTag],
async (items) => { async (items) => {
await this.setState({ await this.setState({
tags: this.getMappedTags(), tags: this.application.getDisplayableItems(ContentType.Tag) as SNTag[],
smartTags: this.application.getSmartTags(), smartTags: this.application.getSmartTags(),
}); });

8
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{ {
"name": "standard-notes-web", "name": "standard-notes-web",
"version": "3.5.9", "version": "3.5.10",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@@ -2574,9 +2574,9 @@
} }
}, },
"@standardnotes/snjs": { "@standardnotes/snjs": {
"version": "2.0.11", "version": "2.0.13",
"resolved": "https://registry.npmjs.org/@standardnotes/snjs/-/snjs-2.0.11.tgz", "resolved": "https://registry.npmjs.org/@standardnotes/snjs/-/snjs-2.0.13.tgz",
"integrity": "sha512-5Ymdd8mez2DNFu4fRmbpZ4BXeFmFhiIFlwZURp8ZM+zqJFRwCo5SXu813DghAU3x51+cPwBMR/3kwuh9GouIpQ==", "integrity": "sha512-yu97v5o25xPfdhvBhNGBhavEEO/hlVeQFcLb8cy6OVoTQrtUBpAmgcB+8DF1AMY/DJo/SDGM/DXcd/+jhjwOsw==",
"requires": { "requires": {
"@standardnotes/sncrypto-common": "^1.2.9" "@standardnotes/sncrypto-common": "^1.2.9"
} }

4
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "standard-notes-web", "name": "standard-notes-web",
"version": "3.5.9", "version": "3.5.10",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"repository": { "repository": {
"type": "git", "type": "git",
@@ -71,7 +71,7 @@
"dependencies": { "dependencies": {
"@bugsnag/js": "^7.5.1", "@bugsnag/js": "^7.5.1",
"@standardnotes/sncrypto-web": "^1.2.9", "@standardnotes/sncrypto-web": "^1.2.9",
"@standardnotes/snjs": "^2.0.11", "@standardnotes/snjs": "^2.0.13",
"mobx": "^6.0.1" "mobx": "^6.0.1"
} }
} }