Merge branch 'main' into km/pm-16926/fix-km-imports

apps/browser/src/autofill/content/notification-bar.ts

@@ -1,8 +1,7 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { ServerConfig } from "../../../../../libs/common/src/platform/abstractions/config/server-config";
+import { ServerConfig } from "@bitwarden/common/platform/abstractions/config/server-config";
+
 import {
   AddLoginMessageData,
   ChangePasswordMessageData,

apps/browser/src/autofill/types/index.ts

@@ -1,7 +1,5 @@
+import { VaultTimeoutAction } from "@bitwarden/common/enums/vault-timeout-action.enum";
 import { Region } from "@bitwarden/common/platform/abstractions/environment.service";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { VaultTimeoutAction } from "@bitwarden/common/src/enums/vault-timeout-action.enum";
 import { VaultTimeout } from "@bitwarden/common/types/vault-timeout.type";
 import { CipherType } from "@bitwarden/common/vault/enums";
 

apps/cli/package.json

@@ -80,7 +80,7 @@
     "papaparse": "5.4.1",
     "proper-lockfile": "4.1.2",
     "rxjs": "7.8.1",
-    "tldts": "6.1.69",
+    "tldts": "6.1.71",
     "zxcvbn": "4.4.2"
   }
 }

apps/desktop/native-messaging-test-runner/package.json

@@ -19,11 +19,11 @@
     "module-alias": "2.2.3",
     "node-ipc": "9.2.1",
     "ts-node": "10.9.2",
-    "uuid": "11.0.3",
+    "uuid": "11.0.5",
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@types/node": "22.10.2",
+    "@types/node": "22.10.5",
     "@types/node-ipc": "9.2.3",
     "typescript": "4.7.4"
   },

apps/web/src/app/vault/org-vault/vault.component.ts

@@ -32,7 +32,6 @@ import {
   switchMap,
   takeUntil,
   tap,
-  withLatestFrom,
 } from "rxjs/operators";
 
 import {
@@ -194,6 +193,7 @@ export class VaultComponent implements OnInit, OnDestroy {
   protected currentSearchText$: Observable<string>;
   protected freeTrial$: Observable<FreeTrial>;
   protected resellerWarning$: Observable<ResellerWarning | null>;
+  protected prevCipherId: string | null = null;
   /**
    * A list of collections that the user can assign items to and edit those items within.
    * @protected
@@ -538,25 +538,26 @@ export class VaultComponent implements OnInit, OnDestroy {
 
     firstSetup$
       .pipe(
-        switchMap(() => this.route.queryParams),
-        // Only process the queryParams if the dialog is not open (only when extension refresh is enabled)
+        switchMap(() => combineLatest([this.route.queryParams, allCipherMap$])),
         filter(() => this.vaultItemDialogRef == undefined || !this.extensionRefreshEnabled),
-        withLatestFrom(allCipherMap$, allCollections$, organization$),
         switchMap(async ([qParams, allCiphersMap]) => {
           const cipherId = getCipherIdFromParams(qParams);
+
           if (!cipherId) {
+            this.prevCipherId = null;
+            return;
+          }
+
+          if (cipherId === this.prevCipherId) {
             return;
           }
-          const cipher = allCiphersMap[cipherId];
 
+          this.prevCipherId = cipherId;
+
+          const cipher = allCiphersMap[cipherId];
           if (cipher) {
             let action = qParams.action;
 
-            // Default to "view" if extension refresh is enabled
-            if (action == null && this.extensionRefreshEnabled) {
-              action = "view";
-            }
-
             if (action == "showFailedToDecrypt") {
               DecryptionFailureDialogComponent.open(this.dialogService, {
                 cipherIds: [cipherId as CipherId],
@@ -569,6 +570,11 @@ export class VaultComponent implements OnInit, OnDestroy {
               return;
             }
 
+            // Default to "view" if extension refresh is enabled
+            if (action == null && this.extensionRefreshEnabled) {
+              action = "view";
+            }
+
             if (action === "view") {
               await this.viewCipherById(cipher);
             } else {

package.json

@@ -73,7 +73,7 @@
     "@types/koa-json": "2.0.23",
     "@types/lowdb": "1.0.15",
     "@types/lunr": "2.3.7",
-    "@types/node": "22.10.2",
+    "@types/node": "22.10.5",
     "@types/node-fetch": "2.6.4",
     "@types/node-forge": "1.3.11",
     "@types/node-ipc": "9.2.3",
@@ -90,7 +90,7 @@
     "base64-loader": "1.0.0",
     "browserslist": "4.23.2",
     "chromatic": "11.20.2",
-    "concurrently": "9.1.0",
+    "concurrently": "9.1.2",
     "copy-webpack-plugin": "12.0.2",
     "cross-env": "7.0.3",
     "css-loader": "7.1.2",
@@ -126,7 +126,7 @@
     "process": "0.11.10",
     "remark-gfm": "4.0.0",
     "rimraf": "6.0.1",
-    "sass": "1.81.0",
+    "sass": "1.83.1",
     "sass-loader": "16.0.4",
     "storybook": "8.4.7",
     "style-loader": "4.0.0",
@@ -201,7 +201,7 @@
     "qrious": "4.0.2",
     "rxjs": "7.8.1",
     "tabbable": "6.2.0",
-    "tldts": "6.1.69",
+    "tldts": "6.1.71",
     "utf-8-validate": "6.0.5",
     "zone.js": "0.14.10",
     "zxcvbn": "4.4.2"