Move PersistenceUtils to panels/common

Bypass-Check-License: move only
Bug: 451895560
Change-Id: I3acc25b1b3599d7ab4fc231667297ab1bd2fcbe9
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/7041142
Commit-Queue: Philip Pfaffe <pfaffe@chromium.org>
Reviewed-by: Philip Pfaffe <pfaffe@chromium.org>
Commit-Queue: Alex Rudenko <alexrudenko@chromium.org>
Auto-Submit: Alex Rudenko <alexrudenko@chromium.org>

Author: OrKoN

config/gni/devtools_grd_files.gni

@@ -1148,7 +1148,6 @@ grd_files_unbundled_sources = [
   "front_end/models/persistence/IsolatedFileSystemManager.js",
   "front_end/models/persistence/NetworkPersistenceManager.js",
   "front_end/models/persistence/PersistenceImpl.js",
-  "front_end/models/persistence/PersistenceUtils.js",
   "front_end/models/persistence/PlatformFileSystem.js",
   "front_end/models/project_settings/ProjectSettingsModel.js",
   "front_end/models/source_map_scopes/NamesResolver.js",
@@ -1431,6 +1430,7 @@ grd_files_unbundled_sources = [
   "front_end/panels/common/BadgeNotification.js",
   "front_end/panels/common/FreDialog.js",
   "front_end/panels/common/GdpSignUpDialog.js",
+  "front_end/panels/common/PersistenceUtils.js",
   "front_end/panels/common/aiCodeCompletionDisclaimer.css.js",
   "front_end/panels/common/aiCodeCompletionSummaryToolbar.css.js",
   "front_end/panels/common/aiCodeCompletionTeaser.css.js",

front_end/entrypoints/main/MainImpl.ts

@@ -54,7 +54,7 @@ import * as Logs from '../../models/logs/logs.js';
 import * as Persistence from '../../models/persistence/persistence.js';
 import * as ProjectSettings from '../../models/project_settings/project_settings.js';
 import * as Workspace from '../../models/workspace/workspace.js';
-import type * as PanelCommon from '../../panels/common/common.js';
+import * as PanelCommon from '../../panels/common/common.js';
 import * as Snippets from '../../panels/snippets/snippets.js';
 import * as Buttons from '../../ui/components/buttons/buttons.js';
 import * as Snackbar from '../../ui/components/snackbars/snackbars.js';
@@ -480,11 +480,13 @@ export class MainImpl {
     isolatedFileSystemManager.addPlatformFileSystem(
         'snippet://' as Platform.DevToolsPath.UrlString, new Snippets.ScriptSnippetFileSystem.SnippetFileSystem());
 
-    Persistence.Persistence.PersistenceImpl.instance({
+    const persistenceImpl = Persistence.Persistence.PersistenceImpl.instance({
       forceNew: true,
       workspace: Workspace.Workspace.WorkspaceImpl.instance(),
       breakpointManager: Breakpoints.BreakpointManager.BreakpointManager.instance(),
     });
+    const linkDecorator = new PanelCommon.PersistenceUtils.LinkDecorator(persistenceImpl);
+    Components.Linkifier.Linkifier.setLinkDecorator(linkDecorator);
     Persistence.NetworkPersistenceManager.NetworkPersistenceManager.instance(
         {forceNew: true, workspace: Workspace.Workspace.WorkspaceImpl.instance()});
 

front_end/models/persistence/BUILD.gn

@@ -18,7 +18,6 @@ devtools_module("persistence") {
     "IsolatedFileSystemManager.ts",
     "NetworkPersistenceManager.ts",
     "PersistenceImpl.ts",
-    "PersistenceUtils.ts",
     "PlatformFileSystem.ts",
   ]
 
@@ -53,6 +52,7 @@ devtools_entrypoint("bundle") {
     "../../entrypoints/main/*",
     "../../panels/ai_assistance/*",
     "../../panels/changes/*",
+    "../../panels/common/*",
     "../../panels/network/*",
     "../../panels/recorder/*",
     "../../panels/settings/*",

front_end/models/persistence/PersistenceImpl.ts

@@ -6,14 +6,12 @@ import * as Common from '../../core/common/common.js';
 import * as Host from '../../core/host/host.js';
 import * as Platform from '../../core/platform/platform.js';
 import * as SDK from '../../core/sdk/sdk.js';
-import * as Components from '../../ui/legacy/components/utils/utils.js';
 import * as Bindings from '../bindings/bindings.js';
 import * as BreakpointManager from '../breakpoints/breakpoints.js';
 import * as TextUtils from '../text_utils/text_utils.js';
 import * as Workspace from '../workspace/workspace.js';
 
 import {Automapping, type AutomappingStatus} from './Automapping.js';
-import {LinkDecorator} from './PersistenceUtils.js';
 
 let persistenceInstance: PersistenceImpl;
 
@@ -33,9 +31,6 @@ export class PersistenceImpl extends Common.ObjectWrapper.ObjectWrapper<EventTyp
     this.#breakpointManager = breakpointManager;
     this.#breakpointManager.addUpdateBindingsCallback(this.#setupBindings.bind(this));
 
-    const linkDecorator = new LinkDecorator(this);
-    Components.Linkifier.Linkifier.setLinkDecorator(linkDecorator);
-
     this.#mapping = new Automapping(this.#workspace, this.onStatusAdded.bind(this), this.onStatusRemoved.bind(this));
   }
 

front_end/models/persistence/persistence.ts

@@ -10,7 +10,6 @@ import * as IsolatedFileSystem from './IsolatedFileSystem.js';
 import * as IsolatedFileSystemManager from './IsolatedFileSystemManager.js';
 import * as NetworkPersistenceManager from './NetworkPersistenceManager.js';
 import * as Persistence from './PersistenceImpl.js';
-import * as PersistenceUtils from './PersistenceUtils.js';
 import * as PlatformFileSystem from './PlatformFileSystem.js';
 
 export {
@@ -22,6 +21,5 @@ export {
   IsolatedFileSystemManager,
   NetworkPersistenceManager,
   Persistence,
-  PersistenceUtils,
   PlatformFileSystem,
 };

front_end/panels/common/BUILD.gn

@@ -28,6 +28,7 @@ devtools_module("common") {
     "BadgeNotification.ts",
     "FreDialog.ts",
     "GdpSignUpDialog.ts",
+    "PersistenceUtils.ts",
   ]
 
   deps = [
@@ -37,8 +38,10 @@ devtools_module("common") {
     "../../core/platform:bundle",
     "../../models/badges:bundle",
     "../../models/geometry:bundle",
+    "../../models/persistence:bundle",
     "../../services/window_bounds:bundle",
     "../../ui/components/buttons:bundle",
+    "../../ui/components/icon_button:bundle",
     "../../ui/components/snackbars:bundle",
     "../../ui/components/spinners:bundle",
     "../../ui/components/switch:bundle",

…d/models/persistence/PersistenceUtils.ts …nt_end/panels/common/PersistenceUtils.tsfront_end/models/persistence/PersistenceUtils.ts renamed to front_end/panels/common/PersistenceUtils.ts front_end/models/persistence/PersistenceUtils.ts renamed to front_end/panels/common/PersistenceUtils.ts

@@ -6,16 +6,11 @@
 import * as Common from '../../core/common/common.js';
 import * as i18n from '../../core/i18n/i18n.js';
 import * as Platform from '../../core/platform/platform.js';
+import * as Persistence from '../../models/persistence/persistence.js';
+import * as Workspace from '../../models/workspace/workspace.js';
 import * as IconButton from '../../ui/components/icon_button/icon_button.js';
 import * as Components from '../../ui/legacy/components/utils/utils.js';
-// TODO(crbug.com/442509324): remove UI dependency
-// eslint-disable-next-line rulesdir/no-imports-in-directory
 import * as UI from '../../ui/legacy/legacy.js';
-import * as Workspace from '../workspace/workspace.js';
-
-import {FileSystemWorkspaceBinding} from './FileSystemWorkspaceBinding.js';
-import {NetworkPersistenceManager} from './NetworkPersistenceManager.js';
-import {Events, type PersistenceBinding, PersistenceImpl} from './PersistenceImpl.js';
 
 const UIStrings = {
   /**
@@ -29,16 +24,17 @@ const UIStrings = {
    */
   linkedToS: 'Linked to {PH1}',
 } as const;
-const str_ = i18n.i18n.registerUIStrings('models/persistence/PersistenceUtils.ts', UIStrings);
+const str_ = i18n.i18n.registerUIStrings('panels/common/PersistenceUtils.ts', UIStrings);
 const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
 export class PersistenceUtils {
   static tooltipForUISourceCode(uiSourceCode: Workspace.UISourceCode.UISourceCode): string {
-    const binding = PersistenceImpl.instance().binding(uiSourceCode);
+    const binding = Persistence.Persistence.PersistenceImpl.instance().binding(uiSourceCode);
     if (!binding) {
       return '';
     }
     if (uiSourceCode === binding.network) {
-      return FileSystemWorkspaceBinding.tooltipForUISourceCode(binding.fileSystem);
+      return Persistence.FileSystemWorkspaceBinding.FileSystemWorkspaceBinding.tooltipForUISourceCode(
+          binding.fileSystem);
     }
     if (binding.network.contentType().isFromSourceMap()) {
       return i18nString(
@@ -48,7 +44,7 @@ export class PersistenceUtils {
   }
 
   static iconForUISourceCode(uiSourceCode: Workspace.UISourceCode.UISourceCode): IconButton.Icon.Icon|null {
-    const binding = PersistenceImpl.instance().binding(uiSourceCode);
+    const binding = Persistence.Persistence.PersistenceImpl.instance().binding(uiSourceCode);
     if (binding) {
       if (!Common.ParsedURL.schemeIs(binding.fileSystem.url(), 'file:')) {
         return null;
@@ -57,7 +53,8 @@ export class PersistenceUtils {
       icon.name = 'document';
       icon.classList.add('small');
       UI.Tooltip.Tooltip.install(icon, PersistenceUtils.tooltipForUISourceCode(binding.network));
-      if (NetworkPersistenceManager.instance().project() === binding.fileSystem.project()) {
+      if (Persistence.NetworkPersistenceManager.NetworkPersistenceManager.instance().project() ===
+          binding.fileSystem.project()) {
         icon.classList.add('dot', 'purple');
       } else {
         icon.classList.add('dot', 'green');
@@ -70,7 +67,8 @@ export class PersistenceUtils {
       return null;
     }
 
-    if (NetworkPersistenceManager.instance().isActiveHeaderOverrides(uiSourceCode)) {
+    if (Persistence.NetworkPersistenceManager.NetworkPersistenceManager.instance().isActiveHeaderOverrides(
+            uiSourceCode)) {
       const icon = new IconButton.Icon.Icon();
       icon.name = 'document';
       icon.classList.add('small');
@@ -88,13 +86,13 @@ export class PersistenceUtils {
 
 export class LinkDecorator extends Common.ObjectWrapper.ObjectWrapper<Components.Linkifier.LinkDecorator.EventTypes>
     implements Components.Linkifier.LinkDecorator {
-  constructor(persistence: PersistenceImpl) {
+  constructor(persistence: Persistence.Persistence.PersistenceImpl) {
     super();
-    persistence.addEventListener(Events.BindingCreated, this.bindingChanged, this);
-    persistence.addEventListener(Events.BindingRemoved, this.bindingChanged, this);
+    persistence.addEventListener(Persistence.Persistence.Events.BindingCreated, this.bindingChanged, this);
+    persistence.addEventListener(Persistence.Persistence.Events.BindingRemoved, this.bindingChanged, this);
   }
 
-  private bindingChanged(event: Common.EventTarget.EventTargetEvent<PersistenceBinding>): void {
+  private bindingChanged(event: Common.EventTarget.EventTargetEvent<Persistence.Persistence.PersistenceBinding>): void {
     const binding = event.data;
     this.dispatchEventToListeners(Components.Linkifier.LinkDecorator.Events.LINK_ICON_CHANGED, binding.network);
   }

front_end/panels/common/common.ts

@@ -100,3 +100,4 @@ export {GdpSignUpDialog} from './GdpSignUpDialog.js';
 export {AiCodeCompletionDisclaimer} from './AiCodeCompletionDisclaimer.js';
 export {AiCodeCompletionSummaryToolbar} from './AiCodeCompletionSummaryToolbar.js';
 export * from './BadgeNotification.js';
+export * as PersistenceUtils from './PersistenceUtils.js';

front_end/panels/sources/TabbedEditorContainer.ts

@@ -16,6 +16,7 @@ import * as Tooltips from '../../ui/components/tooltips/tooltips.js';
 import * as SourceFrame from '../../ui/legacy/components/source_frame/source_frame.js';
 import * as UI from '../../ui/legacy/legacy.js';
 import * as VisualLogging from '../../ui/visual_logging/visual_logging.js';
+import * as PanelCommon from '../common/common.js';
 import * as Snippets from '../snippets/snippets.js';
 
 import {SourcesView} from './SourcesView.js';
@@ -644,7 +645,7 @@ export class TabbedEditorContainer extends Common.ObjectWrapper.ObjectWrapper<Ev
         /* eslint-enable rulesdir/no-imperative-dom-api */
         this.tabbedPane.setSuffixElement(tabId, suffixElement);
       } else {
-        const icon = Persistence.PersistenceUtils.PersistenceUtils.iconForUISourceCode(uiSourceCode);
+        const icon = PanelCommon.PersistenceUtils.PersistenceUtils.iconForUISourceCode(uiSourceCode);
         this.tabbedPane.setTrailingTabIcon(tabId, icon);
       }
     }

front_end/panels/utils/BUILD.gn

@@ -18,6 +18,7 @@ devtools_entrypoint("bundle") {
     "../../ui/components/diff_view:bundle",
     "../../ui/components/icon_button:bundle",
     "../../ui/legacy:bundle",
+    "../common:bundle",
     "../snippets:bundle",
   ]