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

chore: refactor notifications and re-enable vault tests (#2532)

Browse Source 
* chore: refactor notifications and re-enable vault tests

* fix message in error expected
This commit is contained in:
Karol Sójko
2023-09-26 10:21:26 +02:00
committed by GitHub
parent 192a2eccb8
commit 3777a5389e
13 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.yarn/cache/@standardnotes-domain-core-npm-1.32.0-5b0ae039a4-7d1263782c.zip → .yarn/cache/@standardnotes-domain-core-npm-1.33.1-7384cc311d-4caba6cd6f.zip vendored
View File

Binary file not shown.

2
packages/api/package.json
View File

@@ -36,7 +36,7 @@
}, },
"dependencies": { "dependencies": {
"@standardnotes/common": "^1.50.0", "@standardnotes/common": "^1.50.0",
"@standardnotes/domain-core": "^1.32.0", "@standardnotes/domain-core": "^1.33.1",
"@standardnotes/models": "workspace:*", "@standardnotes/models": "workspace:*",
"@standardnotes/responses": "workspace:*", "@standardnotes/responses": "workspace:*",
"@standardnotes/utils": "workspace:*", "@standardnotes/utils": "workspace:*",

2
packages/desktop/package.json
View File

@@ -35,7 +35,7 @@
}, },
"dependencies": { "dependencies": {
"@electron/remote": "^2.0.9", "@electron/remote": "^2.0.9",
"@standardnotes/domain-core": "^1.32.0", "@standardnotes/domain-core": "^1.33.1",
"@standardnotes/electron-clear-data": "1.1.1", "@standardnotes/electron-clear-data": "1.1.1",
"@standardnotes/web": "workspace:*", "@standardnotes/web": "workspace:*",
"axios": "^1.1.3", "axios": "^1.1.3",

2
packages/encryption/package.json
View File

@@ -29,7 +29,7 @@
}, },
"dependencies": { "dependencies": {
"@standardnotes/common": "^1.50.0", "@standardnotes/common": "^1.50.0",
"@standardnotes/domain-core": "^1.32.0", "@standardnotes/domain-core": "^1.33.1",
"@standardnotes/models": "workspace:*", "@standardnotes/models": "workspace:*",
"@standardnotes/responses": "workspace:*", "@standardnotes/responses": "workspace:*",
"@standardnotes/sncrypto-common": "workspace:*", "@standardnotes/sncrypto-common": "workspace:*",

2
packages/features/package.json
View File

@@ -26,7 +26,7 @@
}, },
"dependencies": { "dependencies": {
"@standardnotes/common": "^1.50.0", "@standardnotes/common": "^1.50.0",
"@standardnotes/domain-core": "^1.32.0", "@standardnotes/domain-core": "^1.33.1",
"reflect-metadata": "^0.1.13" "reflect-metadata": "^0.1.13"
}, },
"devDependencies": { "devDependencies": {

2
packages/models/package.json
View File

@@ -20,7 +20,7 @@
}, },
"dependencies": { "dependencies": {
"@standardnotes/common": "^1.50.0", "@standardnotes/common": "^1.50.0",
"@standardnotes/domain-core": "^1.32.0", "@standardnotes/domain-core": "^1.33.1",
"@standardnotes/features": "workspace:*", "@standardnotes/features": "workspace:*",
"@standardnotes/responses": "workspace:*", "@standardnotes/responses": "workspace:*",
"@standardnotes/sncrypto-common": "workspace:^", "@standardnotes/sncrypto-common": "workspace:^",

2
packages/services/package.json
View File

@@ -18,7 +18,7 @@
"dependencies": { "dependencies": {
"@standardnotes/api": "workspace:^", "@standardnotes/api": "workspace:^",
"@standardnotes/common": "^1.50.0", "@standardnotes/common": "^1.50.0",
"@standardnotes/domain-core": "^1.32.0", "@standardnotes/domain-core": "^1.33.1",
"@standardnotes/encryption": "workspace:^", "@standardnotes/encryption": "workspace:^",
"@standardnotes/features": "workspace:^", "@standardnotes/features": "workspace:^",
"@standardnotes/files": "workspace:^", "@standardnotes/files": "workspace:^",

8
packages/services/src/Domain/SharedVaults/SharedVaultService.ts
View File

@@ -105,7 +105,7 @@ export class SharedVaultService
switch (event.eventPayload.props.type.value) { switch (event.eventPayload.props.type.value) {
case NotificationType.TYPES.SelfRemovedFromSharedVault: { case NotificationType.TYPES.SelfRemovedFromSharedVault: {
const vault = this._getVault.execute<SharedVaultListingInterface>({ const vault = this._getVault.execute<SharedVaultListingInterface>({
sharedVaultUuid: event.eventPayload.props.sharedVaultUuid.value, sharedVaultUuid: event.eventPayload.props.primaryIdentifier.value,
}) })
if (!vault.isFailed()) { if (!vault.isFailed()) {
await this._deleteThirdPartyVault.execute(vault.getValue()) await this._deleteThirdPartyVault.execute(vault.getValue())
@@ -113,11 +113,11 @@ export class SharedVaultService
break break
} }
case NotificationType.TYPES.UserRemovedFromSharedVault: { case NotificationType.TYPES.UserRemovedFromSharedVault: {
this.vaultUsers.invalidateVaultUsersCache(event.eventPayload.props.sharedVaultUuid.value).catch(console.error) this.vaultUsers.invalidateVaultUsersCache(event.eventPayload.props.primaryIdentifier.value).catch(console.error)
break break
} }
case NotificationType.TYPES.SharedVaultItemRemoved: { case NotificationType.TYPES.SharedVaultItemRemoved: {
const item = this.items.findItem((event.eventPayload.props.itemUuid as Uuid).value) const item = this.items.findItem((event.eventPayload.props.secondaryIdentifier as Uuid).value)
if (item) { if (item) {
void this._discardItemsLocally.execute([item]) void this._discardItemsLocally.execute([item])
} }
@@ -126,7 +126,7 @@ export class SharedVaultService
case NotificationType.TYPES.SharedVaultFileRemoved: case NotificationType.TYPES.SharedVaultFileRemoved:
case NotificationType.TYPES.SharedVaultFileUploaded: { case NotificationType.TYPES.SharedVaultFileUploaded: {
const vaultOrError = this._getVault.execute<SharedVaultListingInterface>({ const vaultOrError = this._getVault.execute<SharedVaultListingInterface>({
sharedVaultUuid: event.eventPayload.props.sharedVaultUuid.value, sharedVaultUuid: event.eventPayload.props.primaryIdentifier.value,
}) })
if (!vaultOrError.isFailed()) { if (!vaultOrError.isFailed()) {
await this._syncLocalVaultsWithRemoteSharedVaults.execute([vaultOrError.getValue()]) await this._syncLocalVaultsWithRemoteSharedVaults.execute([vaultOrError.getValue()])

2
packages/snjs/mocha/TestRegistry/VaultTests.js
View File

@@ -1,5 +1,5 @@
export const VaultTests = { export const VaultTests = {
enabled: false, enabled: true,
exclusive: false, exclusive: false,
files: [ files: [
'vaults/vaults.test.js', 'vaults/vaults.test.js',

2
packages/snjs/mocha/vaults/key-management.test.js
View File

@@ -59,7 +59,7 @@ describe('vault key management', function () {
await Factory.expectThrowsAsync( await Factory.expectThrowsAsync(
() => context.vaults.removeItemFromVault(item), () => context.vaults.removeItemFromVault(item),
'Cannot find latest version of item to get vault for', 'Cannot find vault to remove item from',
) )
}) })

2
packages/snjs/package.json
View File

@@ -37,7 +37,7 @@
"@babel/preset-env": "*", "@babel/preset-env": "*",
"@standardnotes/api": "workspace:*", "@standardnotes/api": "workspace:*",
"@standardnotes/common": "^1.50.0", "@standardnotes/common": "^1.50.0",
"@standardnotes/domain-core": "^1.32.0", "@standardnotes/domain-core": "^1.33.1",
"@standardnotes/domain-events": "^2.122.0", "@standardnotes/domain-events": "^2.122.0",
"@standardnotes/encryption": "workspace:*", "@standardnotes/encryption": "workspace:*",
"@standardnotes/features": "workspace:*", "@standardnotes/features": "workspace:*",

2
packages/ui-services/package.json
View File

@@ -16,7 +16,7 @@
}, },
"dependencies": { "dependencies": {
"@standardnotes/common": "^1.50.0", "@standardnotes/common": "^1.50.0",
"@standardnotes/domain-core": "^1.32.0", "@standardnotes/domain-core": "^1.33.1",
"@standardnotes/features": "workspace:^", "@standardnotes/features": "workspace:^",
"@standardnotes/filepicker": "workspace:^", "@standardnotes/filepicker": "workspace:^",
"@standardnotes/models": "workspace:^", "@standardnotes/models": "workspace:^",

24
yarn.lock
View File

@@ -4138,7 +4138,7 @@ __metadata:
resolution: "@standardnotes/api@workspace:packages/api" resolution: "@standardnotes/api@workspace:packages/api"
dependencies: dependencies:
"@standardnotes/common": ^1.50.0 "@standardnotes/common": ^1.50.0
"@standardnotes/domain-core": ^1.32.0 "@standardnotes/domain-core": ^1.33.1
"@standardnotes/models": "workspace:*" "@standardnotes/models": "workspace:*"
"@standardnotes/responses": "workspace:*" "@standardnotes/responses": "workspace:*"
"@standardnotes/utils": "workspace:*" "@standardnotes/utils": "workspace:*"
@@ -4288,7 +4288,7 @@ __metadata:
"@babel/core": "*" "@babel/core": "*"
"@babel/preset-env": "*" "@babel/preset-env": "*"
"@electron/remote": ^2.0.9 "@electron/remote": ^2.0.9
"@standardnotes/domain-core": ^1.32.0 "@standardnotes/domain-core": ^1.33.1
"@standardnotes/electron-clear-data": 1.1.1 "@standardnotes/electron-clear-data": 1.1.1
"@standardnotes/web": "workspace:*" "@standardnotes/web": "workspace:*"
"@types/fs-extra": ^11.0.1 "@types/fs-extra": ^11.0.1
@@ -4340,12 +4340,12 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@standardnotes/domain-core@npm:^1.32.0": "@standardnotes/domain-core@npm:^1.33.1":
version: 1.32.0 version: 1.33.1
resolution: "@standardnotes/domain-core@npm:1.32.0" resolution: "@standardnotes/domain-core@npm:1.33.1"
dependencies: dependencies:
uuid: ^9.0.0 uuid: ^9.0.0
checksum: 7d1263782caae6e7aefb245243f3ddc830efec707e2903d3dcb52bd5404d2c9464d3a24c2d4e04671fd9577b9c02bb8e9270b2571fe853b9469889c4b76c67a4 checksum: 4caba6cd6fa667158aa326e43762bc466b726dfbd89e04cfc6fd6b89dce573b1be231350470fc7f1d027868bfd096096de7733256d35a7be699d693e84d29f2a
languageName: node languageName: node
linkType: hard linkType: hard
@@ -4392,7 +4392,7 @@ __metadata:
dependencies: dependencies:
"@standardnotes/common": ^1.50.0 "@standardnotes/common": ^1.50.0
"@standardnotes/config": 2.4.3 "@standardnotes/config": 2.4.3
"@standardnotes/domain-core": ^1.32.0 "@standardnotes/domain-core": ^1.33.1
"@standardnotes/models": "workspace:*" "@standardnotes/models": "workspace:*"
"@standardnotes/responses": "workspace:*" "@standardnotes/responses": "workspace:*"
"@standardnotes/sncrypto-common": "workspace:*" "@standardnotes/sncrypto-common": "workspace:*"
@@ -4427,7 +4427,7 @@ __metadata:
resolution: "@standardnotes/features@workspace:packages/features" resolution: "@standardnotes/features@workspace:packages/features"
dependencies: dependencies:
"@standardnotes/common": ^1.50.0 "@standardnotes/common": ^1.50.0
"@standardnotes/domain-core": ^1.32.0 "@standardnotes/domain-core": ^1.33.1
"@types/jest": ^29.2.3 "@types/jest": ^29.2.3
"@typescript-eslint/eslint-plugin": "*" "@typescript-eslint/eslint-plugin": "*"
eslint: "*" eslint: "*"
@@ -4633,7 +4633,7 @@ __metadata:
resolution: "@standardnotes/models@workspace:packages/models" resolution: "@standardnotes/models@workspace:packages/models"
dependencies: dependencies:
"@standardnotes/common": ^1.50.0 "@standardnotes/common": ^1.50.0
"@standardnotes/domain-core": ^1.32.0 "@standardnotes/domain-core": ^1.33.1
"@standardnotes/features": "workspace:*" "@standardnotes/features": "workspace:*"
"@standardnotes/responses": "workspace:*" "@standardnotes/responses": "workspace:*"
"@standardnotes/sncrypto-common": "workspace:^" "@standardnotes/sncrypto-common": "workspace:^"
@@ -4729,7 +4729,7 @@ __metadata:
dependencies: dependencies:
"@standardnotes/api": "workspace:^" "@standardnotes/api": "workspace:^"
"@standardnotes/common": ^1.50.0 "@standardnotes/common": ^1.50.0
"@standardnotes/domain-core": ^1.32.0 "@standardnotes/domain-core": ^1.33.1
"@standardnotes/encryption": "workspace:^" "@standardnotes/encryption": "workspace:^"
"@standardnotes/features": "workspace:^" "@standardnotes/features": "workspace:^"
"@standardnotes/files": "workspace:^" "@standardnotes/files": "workspace:^"
@@ -4830,7 +4830,7 @@ __metadata:
"@babel/preset-env": "*" "@babel/preset-env": "*"
"@standardnotes/api": "workspace:*" "@standardnotes/api": "workspace:*"
"@standardnotes/common": ^1.50.0 "@standardnotes/common": ^1.50.0
"@standardnotes/domain-core": ^1.32.0 "@standardnotes/domain-core": ^1.33.1
"@standardnotes/domain-events": ^2.122.0 "@standardnotes/domain-events": ^2.122.0
"@standardnotes/encryption": "workspace:*" "@standardnotes/encryption": "workspace:*"
"@standardnotes/features": "workspace:*" "@standardnotes/features": "workspace:*"
@@ -4955,7 +4955,7 @@ __metadata:
resolution: "@standardnotes/ui-services@workspace:packages/ui-services" resolution: "@standardnotes/ui-services@workspace:packages/ui-services"
dependencies: dependencies:
"@standardnotes/common": ^1.50.0 "@standardnotes/common": ^1.50.0
"@standardnotes/domain-core": ^1.32.0 "@standardnotes/domain-core": ^1.33.1
"@standardnotes/features": "workspace:^" "@standardnotes/features": "workspace:^"
"@standardnotes/filepicker": "workspace:^" "@standardnotes/filepicker": "workspace:^"
"@standardnotes/models": "workspace:^" "@standardnotes/models": "workspace:^"