chore(release): publish

- @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected].3
 - @standardnotes/[email protected].6

.github/workflows/snjs.pr.yml

@@ -26,6 +26,8 @@ jobs:
         uses: actions/checkout@v3
       - name: Install dependencies
         run: yarn install --immutable
+      - name: Build
+        run: yarn build:snjs
       - name: Login to Docker Hub
         uses: docker/login-action@v2
         with:

packages/api/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.4.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.4.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/api
+
 ## [1.4.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-05)
 
 **Note:** Version bump only for package @standardnotes/api

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/api",
-  "version": "1.4.7",
+  "version": "1.4.9",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -22,7 +22,7 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest spec --coverage"
+    "test": "jest spec --coverage"
   },
   "devDependencies": {
     "@types/jest": "^28.1.5",

packages/components/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.7.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/components-meta
+
 ## [2.7.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-22)
 
 ### Bug Fixes

packages/components/dist/zips/checksums.json

@@ -90,9 +90,9 @@
     "binary": "54a01414a21e46c67fa59c69189a3d34a6548de7539699f2cf0248f9c5059d37"
   },
   "org.standardnotes.advanced-checklist": {
-    "version": "0.2.3",
-    "base64": "2a2ce988902c9fdb7fe507c826bff13592adfe4fbe1c36e8468155730f507573",
-    "binary": "ae614e38946c480256157554d9af542deb0c9741630ad3242becce391991b994"
+    "version": "0.2.4",
+    "base64": "eaa8225677b18448cf6e8191cbf8a23c012590054d60434730cad20fd5b056f0",
+    "binary": "22db0aba7937234f8e0617a508a46de6a517c3e34be7deee87bc80533065f36c"
   },
   "org.standardnotes.file-safe": {
     "version": "2.0.16",

packages/components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/components-meta",
-  "version": "2.7.8",
+  "version": "2.7.9",
   "private": true,
   "author": "Standard Notes.",
   "main": "dist",

packages/components/src/Packages/Editors/org.standardnotes.advanced-checklist/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.2.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/advanced-checklist
+
 ## [0.2.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-13)
 
 ### Bug Fixes

packages/components/src/Packages/Editors/org.standardnotes.advanced-checklist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/advanced-checklist",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "A task editor with grouping functionality.",
   "author": "Standard Notes.",
   "keywords": [

packages/desktop/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.23.102](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-24)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.101](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.100](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
 ## [3.23.99](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-22)
 
 **Note:** Version bump only for package @standardnotes/desktop

packages/desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@standardnotes/desktop",
   "main": "./app/dist/index.js",
-  "version": "3.23.99",
+  "version": "3.23.102",
   "license": "AGPL-3.0-or-later",
   "author": "Standard Notes.",
   "private": true,

packages/encryption/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.14.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.14.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
 # [1.14.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-05)
 
 ### Bug Fixes

packages/encryption/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/encryption",
-  "version": "1.14.0",
+  "version": "1.14.2",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/features/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.50.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/features
+
 ## [1.50.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-13)
 
 **Note:** Version bump only for package @standardnotes/features

packages/features/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/features",
-  "version": "1.50.4",
+  "version": "1.50.5",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -22,7 +22,7 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest"
+    "test": "jest"
   },
   "dependencies": {
     "@standardnotes/auth": "^3.19.4",

packages/filepicker/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.22.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.22.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
 # [1.22.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-05)
 
 ### Bug Fixes

packages/filepicker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/filepicker",
-  "version": "1.22.0",
+  "version": "1.22.2",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -20,7 +20,7 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest"
+    "test": "jest"
   },
   "devDependencies": {
     "@types/jest": "^28.1.5",

packages/files/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.9.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/files
+
+## [1.9.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/files
+
 # [1.9.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-05)
 
 ### Bug Fixes

packages/files/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/files",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -20,7 +20,7 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest"
+    "test": "jest"
   },
   "devDependencies": {
     "@types/jest": "^28.1.5",

packages/mobile/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.31.18](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-24)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.31.17](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.31.16](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
 ## [3.31.15](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-22)
 
 **Note:** Version bump only for package @standardnotes/mobile

packages/mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/mobile",
-  "version": "3.31.15",
+  "version": "3.31.18",
   "author": "Standard Notes.",
   "private": true,
   "license": "AGPL-3.0-or-later",

packages/models/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.16.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/models
+
+## [1.16.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+### Bug Fixes
+
+* **web:** archived and deleted counts on encryption panel ([#1423](https://github.com/standardnotes/app/issues/1423)) ([2bdd931](https://github.com/standardnotes/app/commit/2bdd931f6dcd876b1659c5d7d045effa26e18a20))
+
 # [1.16.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-05)
 
 ### Features

packages/models/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/models",
-  "version": "1.16.0",
+  "version": "1.16.2",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -20,7 +20,7 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest"
+    "test": "jest"
   },
   "devDependencies": {
     "@types/jest": "^28.1.5",

packages/models/src/Domain/Abstract/Item/Types/ItemCounts.ts

@@ -1,4 +1,4 @@
-export type StructuredItemsCount = {
+export type ItemCounts = {
   notes: number
   tags: number
   deleted: number

packages/models/src/Domain/Abstract/Item/index.ts

@@ -24,6 +24,7 @@ export * from './Mutator/TransactionalMutation'
 export * from './Types/AppDataField'
 export * from './Types/ConflictStrategy'
 export * from './Types/DefaultAppDomain'
+export * from './Types/ItemCounts'
 export * from './Types/ItemStream'
 export * from './Types/MutationType'
 export * from './Types/SingletonStrategy'

packages/releases/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.3.24](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-24)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.3.23](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.3.22](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/releases
+
 ## [1.3.21](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-22)
 
 **Note:** Version bump only for package @standardnotes/releases

packages/releases/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/releases",
-  "version": "1.3.21",
+  "version": "1.3.24",
   "license": "AGPL-3.0-or-later",
   "main": "dist/releases.json",
   "types": "dist/index.d.ts",

packages/responses/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.9.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/responses
+
 ## [1.9.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-13)
 
 ### Bug Fixes

packages/responses/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/responses",
-  "version": "1.9.3",
+  "version": "1.9.4",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -21,7 +21,7 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest spec --coverage --passWithNoTests"
+    "test": "jest spec --coverage --passWithNoTests"
   },
   "devDependencies": {
     "@types/jest": "^28.1.5",

packages/services/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.17.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+### Bug Fixes
+
+* **services:** counting trashed and archived items ([7bff3de](https://github.com/standardnotes/app/commit/7bff3dee24d058be91cb278b09692b4ff4396106))
+
+## [1.17.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+### Bug Fixes
+
+* **web:** archived and deleted counts on encryption panel ([#1423](https://github.com/standardnotes/app/issues/1423)) ([2bdd931](https://github.com/standardnotes/app/commit/2bdd931f6dcd876b1659c5d7d045effa26e18a20))
+
 # [1.17.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-05)
 
 ### Features

packages/services/jest.config.js

@@ -7,5 +7,13 @@ module.exports = {
     'ts-jest': {
       tsconfig: 'tsconfig.json',
     },
+  },
+  coverageThreshold: {
+    global: {
+      branches: 9,
+      functions: 9,
+      lines: 16,
+      statements: 16
+    }
   }
 };

packages/services/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/services",
-  "version": "1.17.0",
+  "version": "1.17.2",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -20,7 +20,7 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest spec --coverage"
+    "test": "jest spec --coverage"
   },
   "dependencies": {
     "@standardnotes/auth": "^3.19.4",

packages/services/src/Domain/Files/FileService.spec.ts

@@ -1,16 +1,16 @@
-import {
-  InternalEventBusInterface,
-  SyncServiceInterface,
-  ItemManagerInterface,
-  AlertService,
-  ApiServiceInterface,
-  ChallengeServiceInterface,
-} from '@standardnotes/services'
-import { FileService } from './FileService'
 import { PureCryptoInterface, StreamEncryptor } from '@standardnotes/sncrypto-common'
 import { FileItem } from '@standardnotes/models'
 import { EncryptionProvider } from '@standardnotes/encryption'
 
+import { ItemManagerInterface } from '../Item/ItemManagerInterface'
+import { ChallengeServiceInterface } from '../Challenge'
+import { InternalEventBusInterface } from '..'
+import { AlertService } from '../Alert/AlertService'
+import { ApiServiceInterface } from '../Api/ApiServiceInterface'
+import { SyncServiceInterface } from '../Sync/SyncServiceInterface'
+
+import { FileService } from './FileService'
+
 describe('fileService', () => {
   let apiService: ApiServiceInterface
   let itemManager: ItemManagerInterface

packages/services/src/Domain/Item/ItemCounter.spec.ts

@@ -0,0 +1,35 @@
+import { ContentType } from '@standardnotes/common'
+import { SNNote, SNTag } from '@standardnotes/models'
+import { ItemCounter } from './ItemCounter'
+
+describe('ItemCounter', () => {
+  const createCounter = () => new ItemCounter()
+
+  it('should count distinct item counts', () => {
+    const items = [
+      {
+        archived: true,
+      } as jest.Mocked<SNNote>,
+      {
+        trashed: true,
+      } as jest.Mocked<SNNote>,
+      {
+        archived: true,
+        trashed: true,
+      } as jest.Mocked<SNNote>,
+      {
+        content_type: ContentType.Note,
+      } as jest.Mocked<SNNote>,
+      {
+        content_type: ContentType.Tag,
+      } as jest.Mocked<SNTag>,
+    ]
+
+    expect(createCounter().countNotesAndTags(items)).toEqual({
+      archived: 1,
+      deleted: 2,
+      notes: 1,
+      tags: 1,
+    })
+  })
+})

packages/services/src/Domain/Item/ItemCounter.ts

@@ -0,0 +1,40 @@
+import { ContentType } from '@standardnotes/common'
+import { SNNote, SNTag, ItemCounts } from '@standardnotes/models'
+
+import { ItemCounterInterface } from './ItemCounterInterface'
+
+export class ItemCounter implements ItemCounterInterface {
+  countNotesAndTags(items: Array<SNNote | SNTag>): ItemCounts {
+    const counts: ItemCounts = {
+      notes: 0,
+      archived: 0,
+      deleted: 0,
+      tags: 0,
+    }
+
+    for (const item of items) {
+      if (item.trashed) {
+        counts.deleted++
+
+        continue
+      }
+      if (item.archived) {
+        counts.archived++
+
+        continue
+      }
+      if (item.content_type === ContentType.Note) {
+        counts.notes++
+
+        continue
+      }
+      if (item.content_type === ContentType.Tag) {
+        counts.tags++
+
+        continue
+      }
+    }
+
+    return counts
+  }
+}

packages/services/src/Domain/Item/ItemCounterInterface.ts

@@ -0,0 +1,5 @@
+import { SNNote, SNTag, ItemCounts } from '@standardnotes/models'
+
+export interface ItemCounterInterface {
+  countNotesAndTags(items: Array<SNNote | SNTag>): ItemCounts
+}

packages/services/src/Domain/index.ts

@@ -50,6 +50,8 @@ export * from './Internal/InternalEventHandlerInterface'
 export * from './Internal/InternalEventInterface'
 export * from './Internal/InternalEventPublishStrategy'
 export * from './Internal/InternalEventType'
+export * from './Item/ItemCounter'
+export * from './Item/ItemCounterInterface'
 export * from './Item/ItemManagerInterface'
 export * from './Item/ItemsClientInterface'
 export * from './Item/ItemsServerInterface'

packages/sncrypto-common/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.11.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/sncrypto-common
+
 # 1.11.0 (2022-07-06)
 
 ### Features

packages/sncrypto-common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/sncrypto-common",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -21,7 +21,7 @@
     "build": "tsc -p tsconfig.json",
     "watch": "tsc -p tsconfig.json --watch",
     "lint": "eslint . --ext .ts",
-    "test:unit": "yarn lint"
+    "test": "yarn lint"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.30.0",

packages/sncrypto-web/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.12.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/sncrypto-web
+
 ## [1.12.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
 
 **Note:** Version bump only for package @standardnotes/sncrypto-web

packages/sncrypto-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/sncrypto-web",
-  "version": "1.12.2",
+  "version": "1.12.3",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/snjs/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.125.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-24)
+
+### Bug Fixes
+
+* **snjs:** showing archived notes on trashed smart view ([#1426](https://github.com/standardnotes/app/issues/1426)) ([2c69a51](https://github.com/standardnotes/app/commit/2c69a514a8a2c3cfe713e118bb6997f21e41ebe8))
+
+## [2.125.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
+## [2.125.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
 # [2.125.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-05)
 
 ### Bug Fixes

packages/snjs/README.md

@@ -58,5 +58,5 @@ yarn start:server:e2e
 From the root of the repository, run:
 
 ```
-yarn run test:unit
+yarn run test
 ```

packages/snjs/jest.config.js

@@ -31,7 +31,7 @@ module.exports = {
       branches: 13,
       functions: 22,
       lines: 27,
-      statements: 28,
+      statements: 27,
     },
   },
 }

packages/snjs/lib/Services/Items/ItemManager.spec.ts

@@ -11,6 +11,8 @@ import {
   FillItemContent,
   PayloadTimestampDefaults,
   NoteContent,
+  SmartView,
+  SystemViewId,
 } from '@standardnotes/models'
 
 const setupRandomUuid = () => {
@@ -179,6 +181,39 @@ describe('itemManager', () => {
       const notes = itemManager.getDisplayableNotes()
       expect(notes).toHaveLength(1)
     })
+
+    it('viewing trashed notes smart view should include archived notes', async () => {
+      itemManager = createService()
+
+      const archivedNote = createNote('archived')
+      const trashedNote = createNote('trashed')
+      const archivedAndTrashedNote = createNote('archived&trashed')
+
+      await itemManager.insertItems([archivedNote, trashedNote, archivedAndTrashedNote])
+
+      await itemManager.changeItem<Models.NoteMutator>(archivedNote, (m) => {
+        m.archived = true
+      })
+      await itemManager.changeItem<Models.NoteMutator>(trashedNote, (m) => {
+        m.trashed = true
+      })
+      await itemManager.changeItem<Models.NoteMutator>(archivedAndTrashedNote, (m) => {
+        m.trashed = true
+        m.archived = true
+      })
+
+      itemManager.setPrimaryItemDisplayOptions({
+        sortBy: 'title',
+        sortDirection: 'asc',
+        includeArchived: false,
+        includeTrashed: false,
+        views: [{ uuid: SystemViewId.TrashedNotes } as jest.Mocked<SmartView>],
+      })
+
+      const notes = itemManager.getDisplayableNotes()
+
+      expect(notes).toHaveLength(2)
+    })
   })
 
   describe('tag relationships', () => {

packages/snjs/lib/Services/Items/ItemManager.ts

@@ -127,20 +127,20 @@ export class ItemManager
     const override: Models.FilterDisplayOptions = {}
 
     if (options.views && options.views.find((view) => view.uuid === Models.SystemViewId.AllNotes)) {
-      if (options.includeArchived == undefined) {
+      if (options.includeArchived === undefined) {
         override.includeArchived = false
       }
-      if (options.includeTrashed == undefined) {
+      if (options.includeTrashed === undefined) {
         override.includeTrashed = false
       }
     }
     if (options.views && options.views.find((view) => view.uuid === Models.SystemViewId.ArchivedNotes)) {
-      if (options.includeTrashed == undefined) {
+      if (options.includeTrashed === undefined) {
         override.includeTrashed = false
       }
     }
     if (options.views && options.views.find((view) => view.uuid === Models.SystemViewId.TrashedNotes)) {
-      if (options.includeArchived == undefined) {
+      if (!options.includeArchived) {
         override.includeArchived = true
       }
     }

packages/snjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/snjs",
-  "version": "2.125.0",
+  "version": "2.125.3",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -25,7 +25,7 @@
     "lint": "yarn lint:tsc && yarn lint:eslint",
     "lint:eslint": "eslint --ext .ts lib/",
     "lint:tsc": "tsc --noEmit --emitDeclarationOnly false --project lib/tsconfig.json",
-    "test:unit": "jest spec --coverage",
+    "test": "jest spec --coverage",
     "test:debug": "node --inspect-brk node_modules/.bin/jest --runInBand"
   },
   "devDependencies": {

packages/ui-services/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/ui-services
+
+## [1.1.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/ui-services
+
 ## [1.1.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-11)
 
 **Note:** Version bump only for package @standardnotes/ui-services

packages/ui-services/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/ui-services",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -20,7 +20,7 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest spec --coverage"
+    "test": "jest spec --coverage --passWithNoTests"
   },
   "dependencies": {
     "@standardnotes/common": "^1.30.0",

packages/utils/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.8.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/utils
+
 ## [1.8.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-13)
 
 ### Bug Fixes

packages/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/utils",
-  "version": "1.8.2",
+  "version": "1.8.3",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -22,7 +22,7 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest spec"
+    "test": "jest spec"
   },
   "dependencies": {
     "@standardnotes/common": "^1.23.1",

packages/web/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.45.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-24)
+
+**Note:** Version bump only for package @standardnotes/web
+
+## [3.45.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/web
+
+## [3.45.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+### Bug Fixes
+
+* **web:** archived and deleted counts on encryption panel ([#1423](https://github.com/standardnotes/app/issues/1423)) ([2bdd931](https://github.com/standardnotes/app/commit/2bdd931f6dcd876b1659c5d7d045effa26e18a20))
+
 ## [3.45.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-22)
 
 **Note:** Version bump only for package @standardnotes/web

packages/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/web",
-  "version": "3.45.3",
+  "version": "3.45.6",
   "license": "AGPL-3.0-or-later",
   "main": "dist/app.js",
   "author": "Standard Notes.",

packages/web/src/javascripts/Controllers/AccountMenu/AccountMenuController.ts

@@ -1,10 +1,17 @@
 import { destroyAllObjectProperties, isDev } from '@/Utils'
 import { action, computed, makeObservable, observable, runInAction } from 'mobx'
-import { ApplicationEvent, ContentType, InternalEventBus, SNNote, SNTag } from '@standardnotes/snjs'
+import {
+  ApplicationEvent,
+  ContentType,
+  InternalEventBus,
+  SNNote,
+  SNTag,
+  ItemCounterInterface,
+  ItemCounts,
+} from '@standardnotes/snjs'
 import { WebApplication } from '@/Application/Application'
 import { AccountMenuPane } from '@/Components/AccountMenu/AccountMenuPane'
 import { AbstractViewController } from '../Abstract/AbstractViewController'
-import { StructuredItemsCount } from './StructuredItemsCount'
 
 export class AccountMenuController extends AbstractViewController {
   show = false
@@ -28,7 +35,7 @@ export class AccountMenuController extends AbstractViewController {
     destroyAllObjectProperties(this)
   }
 
-  constructor(application: WebApplication, eventBus: InternalEventBus) {
+  constructor(application: WebApplication, eventBus: InternalEventBus, private itemCounter: ItemCounterInterface) {
     super(application, eventBus)
 
     makeObservable(this, {
@@ -152,30 +159,7 @@ export class AccountMenuController extends AbstractViewController {
     return this.notesAndTags.length
   }
 
-  get structuredNotesAndTagsCount(): StructuredItemsCount {
-    const count: StructuredItemsCount = {
-      notes: 0,
-      archived: 0,
-      deleted: 0,
-      tags: 0,
-    }
-    for (const item of this.notesAndTags) {
-      if (item.archived) {
-        count.archived++
-      }
-
-      if (item.trashed) {
-        count.deleted++
-      }
-
-      if (item.content_type === ContentType.Note) {
-        count.notes++
-      }
-
-      if (item.content_type === ContentType.Tag) {
-        count.tags++
-      }
-    }
-    return count
+  get structuredNotesAndTagsCount(): ItemCounts {
+    return this.itemCounter.countNotesAndTags(this.notesAndTags)
   }
 }

packages/web/src/javascripts/Controllers/ViewControllerManager.ts

@@ -2,7 +2,14 @@ import { storage, StorageKey } from '@standardnotes/ui-services'
 import { WebApplication } from '@/Application/Application'
 import { AccountMenuController } from '@/Controllers/AccountMenu/AccountMenuController'
 import { destroyAllObjectProperties } from '@/Utils'
-import { ApplicationEvent, DeinitSource, WebOrDesktopDeviceInterface, InternalEventBus } from '@standardnotes/snjs'
+import {
+  ApplicationEvent,
+  DeinitSource,
+  WebOrDesktopDeviceInterface,
+  InternalEventBus,
+  ItemCounterInterface,
+  ItemCounter,
+} from '@standardnotes/snjs'
 import { action, makeObservable, observable } from 'mobx'
 import { ActionsMenuController } from './ActionsMenuController'
 import { FeaturesController } from './FeaturesController'
@@ -52,10 +59,13 @@ export class ViewControllerManager {
 
   private appEventObserverRemovers: (() => void)[] = []
   private eventBus: InternalEventBus
+  private itemCounter: ItemCounterInterface
 
   constructor(public application: WebApplication, private device: WebOrDesktopDeviceInterface) {
     this.eventBus = new InternalEventBus()
 
+    this.itemCounter = new ItemCounter()
+
     this.selectionController = new SelectedItemsController(application, this.eventBus)
 
     this.noteTagsController = new NoteTagsController(application, this.eventBus)
@@ -90,7 +100,7 @@ export class ViewControllerManager {
 
     this.noAccountWarningController = new NoAccountWarningController(application, this.eventBus)
 
-    this.accountMenuController = new AccountMenuController(application, this.eventBus)
+    this.accountMenuController = new AccountMenuController(application, this.eventBus, this.itemCounter)
 
     this.subscriptionController = new SubscriptionController(application, this.eventBus)