From 3e495ab082e2152284a36bb5d2b2fb7a4060cfb3 Mon Sep 17 00:00:00 2001
From: Daniel James Smith <2670567+djsmith85@users.noreply.github.com>
Date: Fri, 20 Oct 2023 23:03:06 +0200
Subject: [PATCH] Revert "[PM-4290] Add pop out warning on import page (#6645)"
 (#6651)

* Revert "[PM-4290] Add pop out warning on import page (#6645)"

This reverts commit 8dc81b603dc56d666c05bed6d89998d186e7c7fe.

* Change icon on `Import items` in browser-settings

Replace the bwi-angle-right icon with the bwi-external-link and rotate it

Box with arrow pointing to the top right indicates external linkg
Box with arrow pointing to the top left indicates popout window

---------

Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
---
 .../src/popup/settings/settings.component.html   |  5 ++++-
 .../src/popup/settings/settings.component.ts     |  5 ++++-
 .../import/import-browser.component.html         |  2 --
 .../settings/import/import-browser.component.ts  | 16 +++-------------
 .../src/components/import.component.html         |  2 +-
 libs/importer/src/components/import.component.ts |  2 --
 6 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/apps/browser/src/popup/settings/settings.component.html b/apps/browser/src/popup/settings/settings.component.html
index 6591d11cc1..f96a7ffdb7 100644
--- a/apps/browser/src/popup/settings/settings.component.html
+++ b/apps/browser/src/popup/settings/settings.component.html
@@ -183,7 +183,10 @@
         (click)="import()"
       >
         <div class="row-main">{{ "importItems" | i18n }}</div>
-        <i class="bwi bwi-angle-right bwi-lg row-sub-icon" aria-hidden="true"></i>
+        <i
+          class="bwi bwi-external-link bwi-lg row-sub-icon bwi-rotate-270 bwi-fw"
+          aria-hidden="true"
+        ></i>
       </button>
       <button
         type="button"
diff --git a/apps/browser/src/popup/settings/settings.component.ts b/apps/browser/src/popup/settings/settings.component.ts
index ad02ee66c2..252a209715 100644
--- a/apps/browser/src/popup/settings/settings.component.ts
+++ b/apps/browser/src/popup/settings/settings.component.ts
@@ -474,7 +474,10 @@ export class SettingsComponent implements OnInit {
   }
 
   async import() {
-    this.router.navigate(["/import"]);
+    await this.router.navigate(["/import"]);
+    if (await BrowserApi.isPopupOpen()) {
+      this.popupUtilsService.popOut(window);
+    }
   }
 
   export() {
diff --git a/apps/browser/src/tools/popup/settings/import/import-browser.component.html b/apps/browser/src/tools/popup/settings/import/import-browser.component.html
index 695529c4d2..b305e6c395 100644
--- a/apps/browser/src/tools/popup/settings/import/import-browser.component.html
+++ b/apps/browser/src/tools/popup/settings/import/import-browser.component.html
@@ -16,11 +16,9 @@
   </div>
 </header>
 <div tabindex="-1" class="tw-p-4">
-  <tools-file-popout-callout />
   <tools-import
     (formDisabled)="this.disabled = $event"
     (formLoading)="this.loading = $event"
     (onSuccessfulImport)="this.onSuccessfulImport($event)"
-    [hideFileSelector]="this.hideFileSelector"
   ></tools-import>
 </div>
diff --git a/apps/browser/src/tools/popup/settings/import/import-browser.component.ts b/apps/browser/src/tools/popup/settings/import/import-browser.component.ts
index 30ead216b5..3fea3aad04 100644
--- a/apps/browser/src/tools/popup/settings/import/import-browser.component.ts
+++ b/apps/browser/src/tools/popup/settings/import/import-browser.component.ts
@@ -1,14 +1,11 @@
 import { CommonModule } from "@angular/common";
-import { Component, OnInit } from "@angular/core";
+import { Component } from "@angular/core";
 import { Router, RouterLink } from "@angular/router";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { AsyncActionsModule, ButtonModule, DialogModule } from "@bitwarden/components";
 import { ImportComponent } from "@bitwarden/importer/ui";
 
-import { FilePopoutCalloutComponent } from "../../components/file-popout-callout.component";
-import { FilePopoutUtilsService } from "../../services/file-popout-utils.service";
-
 @Component({
   templateUrl: "import-browser.component.html",
   standalone: true,
@@ -20,20 +17,13 @@ import { FilePopoutUtilsService } from "../../services/file-popout-utils.service
     AsyncActionsModule,
     ButtonModule,
     ImportComponent,
-    FilePopoutCalloutComponent,
   ],
 })
-export class ImportBrowserComponent implements OnInit {
+export class ImportBrowserComponent {
   protected disabled = false;
   protected loading = false;
 
-  protected hideFileSelector = false;
-
-  constructor(private router: Router, private filePopoutUtilsService: FilePopoutUtilsService) {}
-
-  ngOnInit(): void {
-    this.hideFileSelector = this.filePopoutUtilsService.showFilePopoutMessage(window);
-  }
+  constructor(private router: Router) {}
 
   protected async onSuccessfulImport(organizationId: string): Promise<void> {
     this.router.navigate(["/tabs/settings"]);
diff --git a/libs/importer/src/components/import.component.html b/libs/importer/src/components/import.component.html
index ab9250a4c7..83e119fcc5 100644
--- a/libs/importer/src/components/import.component.html
+++ b/libs/importer/src/components/import.component.html
@@ -344,7 +344,7 @@
       and save the zip file.
     </ng-container>
   </bit-callout>
-  <bit-form-field *ngIf="!hideFileSelector">
+  <bit-form-field>
     <bit-label>{{ "selectImportFile" | i18n }}</bit-label>
     <div class="file-selector">
       <button bitButton type="button" buttonType="secondary" (click)="fileSelector.click()">
diff --git a/libs/importer/src/components/import.component.ts b/libs/importer/src/components/import.component.ts
index 371a1846ac..3a111720ab 100644
--- a/libs/importer/src/components/import.component.ts
+++ b/libs/importer/src/components/import.component.ts
@@ -120,8 +120,6 @@ export class ImportComponent implements OnInit, OnDestroy {
       });
   }
 
-  @Input() hideFileSelector: boolean;
-
   protected organization: Organization;
   protected destroy$ = new Subject<void>();