Skip to content

Commit 7562764

Browse files
danilsomsikovDevtools-frontend LUCI CQ
danilsomsikov
authored and
Devtools-frontend LUCI CQ
committed
Move FrameDetailsView and OriginTrialTreeView outside of components/.
Bypass-Check-License: Moved files Bug: 407750239 Change-Id: I89a13d3b7c36ec7c5d8b1eeb26d53e513c7dcffc Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/7161913 Reviewed-by: Simon Zünd <[email protected]> Commit-Queue: Simon Zünd <[email protected]> Auto-Submit: Danil Somsikov <[email protected]>
1 parent 08059ae commit 7562764

13 files changed

+83
-85
lines changed

‎config/gni/devtools_grd_files.gni‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1323,13 +1323,15 @@ grd_files_unbundled_sources = [
13231323
"front_end/panels/application/DOMStorageModel.js",
13241324
"front_end/panels/application/ExtensionStorageItemsView.js",
13251325
"front_end/panels/application/ExtensionStorageModel.js",
1326+
"front_end/panels/application/FrameDetailsView.js",
13261327
"front_end/panels/application/IndexedDBModel.js",
13271328
"front_end/panels/application/IndexedDBViews.js",
13281329
"front_end/panels/application/InterestGroupStorageModel.js",
13291330
"front_end/panels/application/InterestGroupStorageView.js",
13301331
"front_end/panels/application/InterestGroupTreeElement.js",
13311332
"front_end/panels/application/KeyValueStorageItemsView.js",
13321333
"front_end/panels/application/OpenedWindowDetailsView.js",
1334+
"front_end/panels/application/OriginTrialTreeView.js",
13331335
"front_end/panels/application/PreloadingTreeElement.js",
13341336
"front_end/panels/application/ReportingApiTreeElement.js",
13351337
"front_end/panels/application/ReportingApiView.js",
@@ -1353,9 +1355,7 @@ grd_files_unbundled_sources = [
13531355
"front_end/panels/application/components/BackForwardCacheView.js",
13541356
"front_end/panels/application/components/BounceTrackingMitigationsView.js",
13551357
"front_end/panels/application/components/EndpointsGrid.js",
1356-
"front_end/panels/application/components/FrameDetailsView.js",
13571358
"front_end/panels/application/components/InterestGroupAccessGrid.js",
1358-
"front_end/panels/application/components/OriginTrialTreeView.js",
13591359
"front_end/panels/application/components/PermissionsPolicySection.js",
13601360
"front_end/panels/application/components/ProtocolHandlersView.js",
13611361
"front_end/panels/application/components/ReportsGrid.js",
@@ -1368,10 +1368,7 @@ grd_files_unbundled_sources = [
13681368
"front_end/panels/application/components/backForwardCacheView.css.js",
13691369
"front_end/panels/application/components/bounceTrackingMitigationsView.css.js",
13701370
"front_end/panels/application/components/endpointsGrid.css.js",
1371-
"front_end/panels/application/components/frameDetailsReportView.css.js",
13721371
"front_end/panels/application/components/interestGroupAccessGrid.css.js",
1373-
"front_end/panels/application/components/originTrialTokenRows.css.js",
1374-
"front_end/panels/application/components/originTrialTreeView.css.js",
13751372
"front_end/panels/application/components/permissionsPolicySection.css.js",
13761373
"front_end/panels/application/components/protocolHandlersView.css.js",
13771374
"front_end/panels/application/components/reportsGrid.css.js",
@@ -1383,9 +1380,12 @@ grd_files_unbundled_sources = [
13831380
"front_end/panels/application/components/storageMetadataView.css.js",
13841381
"front_end/panels/application/components/trustTokensView.css.js",
13851382
"front_end/panels/application/cookieItemsView.css.js",
1383+
"front_end/panels/application/frameDetailsReportView.css.js",
13861384
"front_end/panels/application/indexedDBViews.css.js",
13871385
"front_end/panels/application/interestGroupStorageView.css.js",
13881386
"front_end/panels/application/openedWindowDetailsView.css.js",
1387+
"front_end/panels/application/originTrialTokenRows.css.js",
1388+
"front_end/panels/application/originTrialTreeView.css.js",
13891389
"front_end/panels/application/preloading/PreloadingView.js",
13901390
"front_end/panels/application/preloading/components/MismatchedPreloadingGrid.js",
13911391
"front_end/panels/application/preloading/components/PreloadingDetailsReportView.js",

‎front_end/panels/application/ApplicationPanelSidebar.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ import {BackForwardCacheTreeElement} from './BackForwardCacheTreeElement.js';
5151
import {BackgroundServiceModel} from './BackgroundServiceModel.js';
5252
import {BackgroundServiceView} from './BackgroundServiceView.js';
5353
import {BounceTrackingMitigationsTreeElement} from './BounceTrackingMitigationsTreeElement.js';
54-
import * as ApplicationComponents from './components/components.js';
5554
import {type DOMStorage, DOMStorageModel, Events as DOMStorageModelEvents} from './DOMStorageModel.js';
5655
import {
5756
Events as ExtensionStorageModelEvents,
5857
type ExtensionStorage,
5958
ExtensionStorageModel,
6059
} from './ExtensionStorageModel.js';
60+
import {FrameDetailsReportView} from './FrameDetailsView.js';
6161
import {
6262
type Database as IndexedDBModelDatabase,
6363
type DatabaseId,
@@ -2149,7 +2149,7 @@ export class FrameTreeElement extends ApplicationPanelTreeElement {
21492149
private readonly treeElementForResource: Map<string, FrameResourceTreeElement>;
21502150
private treeElementForWindow: Map<Protocol.Target.TargetID, FrameWindowTreeElement>;
21512151
private treeElementForWorker: Map<Protocol.Target.TargetID, WorkerTreeElement>;
2152-
private view: ApplicationComponents.FrameDetailsView.FrameDetailsReportView|null;
2152+
private view: FrameDetailsReportView|null;
21532153

21542154
constructor(section: ResourcesSection, frame: SDK.ResourceTreeModel.ResourceTreeFrame) {
21552155
super(section.panel, '', false, 'frame');
@@ -2194,7 +2194,7 @@ export class FrameTreeElement extends ApplicationPanelTreeElement {
21942194
this.treeElementForWorker.clear();
21952195

21962196
if (this.selected) {
2197-
this.view = new ApplicationComponents.FrameDetailsView.FrameDetailsReportView();
2197+
this.view = new FrameDetailsReportView();
21982198
this.view.frame = this.frame;
21992199
this.showView(this.view);
22002200
} else {
@@ -2232,7 +2232,7 @@ export class FrameTreeElement extends ApplicationPanelTreeElement {
22322232
override onselect(selectedByUser?: boolean): boolean {
22332233
super.onselect(selectedByUser);
22342234
if (!this.view) {
2235-
this.view = new ApplicationComponents.FrameDetailsView.FrameDetailsReportView();
2235+
this.view = new FrameDetailsReportView();
22362236
this.view.frame = this.frame;
22372237
}
22382238
Host.userMetrics.panelShown('frame-details');

‎front_end/panels/application/BUILD.gn‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,12 @@ generate_css("css_files") {
1313
"appManifestView.css",
1414
"backgroundServiceView.css",
1515
"cookieItemsView.css",
16+
"frameDetailsReportView.css",
1617
"indexedDBViews.css",
1718
"interestGroupStorageView.css",
1819
"openedWindowDetailsView.css",
20+
"originTrialTokenRows.css",
21+
"originTrialTreeView.css",
1922
"preloading/preloadingView.css",
2023
"preloading/preloadingViewDropDown.css",
2124
"resourcesPanel.css",
@@ -42,13 +45,15 @@ devtools_ui_module("application") {
4245
"DOMStorageModel.ts",
4346
"ExtensionStorageItemsView.ts",
4447
"ExtensionStorageModel.ts",
48+
"FrameDetailsView.ts",
4549
"IndexedDBModel.ts",
4650
"IndexedDBViews.ts",
4751
"InterestGroupStorageModel.ts",
4852
"InterestGroupStorageView.ts",
4953
"InterestGroupTreeElement.ts",
5054
"KeyValueStorageItemsView.ts",
5155
"OpenedWindowDetailsView.ts",
56+
"OriginTrialTreeView.ts",
5257
"PreloadingTreeElement.ts",
5358
"ReportingApiTreeElement.ts",
5459
"ReportingApiView.ts",
@@ -147,11 +152,13 @@ devtools_ui_module("unittests") {
147152
"DOMStorageModel.test.ts",
148153
"ExtensionStorageItemsView.test.ts",
149154
"ExtensionStorageModel.test.ts",
155+
"FrameDetailsView.test.ts",
150156
"IndexedDBModel.test.ts",
151157
"IndexedDBViews.test.ts",
152158
"InterestGroupStorageView.test.ts",
153159
"InterestGroupTreeElement.test.ts",
154160
"KeyValueStorageItemsView.test.ts",
161+
"OriginTrialTreeView.test.ts",
155162
"PreloadingTreeElement.test.ts",
156163
"ReportingApiView.test.ts",
157164
"ServiceWorkerUpdateCycleView.test.ts",

‎front_end/panels/application/components/FrameDetailsView.test.ts‎ renamed to ‎front_end/panels/application/FrameDetailsView.test.ts‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,27 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import * as SDK from '../../../core/sdk/sdk.js';
6-
import * as Protocol from '../../../generated/protocol.js';
7-
import * as Bindings from '../../../models/bindings/bindings.js';
8-
import * as Workspace from '../../../models/workspace/workspace.js';
5+
import * as SDK from '../../core/sdk/sdk.js';
6+
import * as Protocol from '../../generated/protocol.js';
7+
import * as Bindings from '../../models/bindings/bindings.js';
8+
import * as Workspace from '../../models/workspace/workspace.js';
99
import {
1010
getCleanTextContentFromElements,
1111
getElementsWithinComponent,
1212
getElementWithinComponent,
1313
raf,
1414
renderElementIntoDOM,
15-
} from '../../../testing/DOMHelpers.js';
16-
import {createTarget} from '../../../testing/EnvironmentHelpers.js';
15+
} from '../../testing/DOMHelpers.js';
16+
import {createTarget} from '../../testing/EnvironmentHelpers.js';
1717
import {
1818
describeWithMockConnection,
1919
dispatchEvent,
20-
} from '../../../testing/MockConnection.js';
21-
import * as ExpandableList from '../../../ui/components/expandable_list/expandable_list.js';
22-
import type * as ReportView from '../../../ui/components/report_view/report_view.js';
20+
} from '../../testing/MockConnection.js';
21+
import * as ExpandableList from '../../ui/components/expandable_list/expandable_list.js';
22+
import type * as ReportView from '../../ui/components/report_view/report_view.js';
2323

24-
import * as ApplicationComponents from './components.js';
24+
import * as Application from './application.js';
25+
import * as ApplicationComponents from './components/components.js';
2526

2627
const makeFrame = (target: SDK.Target.Target) => {
2728
const newFrame: SDK.ResourceTreeModel.ResourceTreeFrame = {
@@ -88,7 +89,7 @@ const makeFrame = (target: SDK.Target.Target) => {
8889
describeWithMockConnection('FrameDetailsView', () => {
8990
it('renders with a title', async () => {
9091
const frame = makeFrame(createTarget());
91-
const component = new ApplicationComponents.FrameDetailsView.FrameDetailsReportView();
92+
const component = new Application.FrameDetailsView.FrameDetailsReportView();
9293
component.frame = frame;
9394
renderElementIntoDOM(component);
9495

@@ -179,7 +180,7 @@ describeWithMockConnection('FrameDetailsView', () => {
179180
}],
180181
});
181182

182-
const component = new ApplicationComponents.FrameDetailsView.FrameDetailsReportView();
183+
const component = new Application.FrameDetailsView.FrameDetailsReportView();
183184
component.frame = frame;
184185
renderElementIntoDOM(component);
185186

‎front_end/panels/application/components/FrameDetailsView.ts‎ renamed to ‎front_end/panels/application/FrameDetailsView.ts‎

Lines changed: 29 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,31 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import '../../../ui/components/expandable_list/expandable_list.js';
6-
import '../../../ui/components/report_view/report_view.js';
7-
import './StackTrace.js';
8-
9-
import * as Common from '../../../core/common/common.js';
10-
import * as i18n from '../../../core/i18n/i18n.js';
11-
import type * as Platform from '../../../core/platform/platform.js';
12-
import * as Root from '../../../core/root/root.js';
13-
import * as SDK from '../../../core/sdk/sdk.js';
14-
import * as Protocol from '../../../generated/protocol.js';
15-
import * as Bindings from '../../../models/bindings/bindings.js';
16-
import * as Workspace from '../../../models/workspace/workspace.js';
17-
import * as PanelCommon from '../../../panels/common/common.js';
18-
import * as NetworkForward from '../../../panels/network/forward/forward.js';
19-
import * as CspEvaluator from '../../../third_party/csp_evaluator/csp_evaluator.js';
20-
import * as Buttons from '../../../ui/components/buttons/buttons.js';
21-
import type * as ExpandableList from '../../../ui/components/expandable_list/expandable_list.js';
22-
import type * as ReportView from '../../../ui/components/report_view/report_view.js';
23-
import * as Components from '../../../ui/legacy/components/utils/utils.js';
24-
import * as UI from '../../../ui/legacy/legacy.js';
25-
import {Directives, html, type LitTemplate, nothing, render} from '../../../ui/lit/lit.js';
26-
import * as VisualLogging from '../../../ui/visual_logging/visual_logging.js';
27-
5+
import '../../ui/components/expandable_list/expandable_list.js';
6+
import '../../ui/components/report_view/report_view.js';
7+
8+
import * as Common from '../../core/common/common.js';
9+
import * as i18n from '../../core/i18n/i18n.js';
10+
import type * as Platform from '../../core/platform/platform.js';
11+
import * as Root from '../../core/root/root.js';
12+
import * as SDK from '../../core/sdk/sdk.js';
13+
import * as Protocol from '../../generated/protocol.js';
14+
import * as Bindings from '../../models/bindings/bindings.js';
15+
import * as Workspace from '../../models/workspace/workspace.js';
16+
import * as PanelCommon from '../../panels/common/common.js';
17+
import * as NetworkForward from '../../panels/network/forward/forward.js';
18+
import * as CspEvaluator from '../../third_party/csp_evaluator/csp_evaluator.js';
19+
import * as Buttons from '../../ui/components/buttons/buttons.js';
20+
import type * as ExpandableList from '../../ui/components/expandable_list/expandable_list.js';
21+
import type * as ReportView from '../../ui/components/report_view/report_view.js';
22+
import * as Components from '../../ui/legacy/components/utils/utils.js';
23+
import * as UI from '../../ui/legacy/legacy.js';
24+
import {Directives, html, type LitTemplate, nothing, render} from '../../ui/lit/lit.js';
25+
import * as VisualLogging from '../../ui/visual_logging/visual_logging.js';
26+
27+
import * as ApplicationComponents from './components/components.js';
2828
import frameDetailsReportViewStyles from './frameDetailsReportView.css.js';
2929
import {OriginTrialTreeView} from './OriginTrialTreeView.js';
30-
import {
31-
type PermissionsPolicySectionData,
32-
renderIconLink,
33-
} from './PermissionsPolicySection.js';
34-
import type {StackTraceData} from './StackTrace.js';
3530

3631
const {until} = Directives;
3732
const {widgetConfig} = UI.Widget;
@@ -263,7 +258,7 @@ const UIStrings = {
263258
*/
264259
originTrialsExplanation: 'Origin trials give you access to a new or experimental feature.',
265260
} as const;
266-
const str_ = i18n.i18n.registerUIStrings('panels/application/components/FrameDetailsView.ts', UIStrings);
261+
const str_ = i18n.i18n.registerUIStrings('panels/application/FrameDetailsView.ts', UIStrings);
267262
const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
268263

269264
export interface FrameDetailsReportViewData {
@@ -302,7 +297,7 @@ const DEFAULT_VIEW: View = (input, _output, target) => {
302297
${renderOriginTrial(input.trials)}
303298
${until(input.permissionsPolicies?.then?.(policies =>
304299
html`
305-
<devtools-resources-permissions-policy-section .data=${{policies, showDetails: false} as PermissionsPolicySectionData}>
300+
<devtools-resources-permissions-policy-section .data=${{policies, showDetails: false} as ApplicationComponents.PermissionsPolicySection.PermissionsPolicySectionData}>
306301
</devtools-resources-permissions-policy-section>
307302
`), nothing)}
308303
${input.protocolMonitorExperimentEnabled ? renderAdditionalInfoSection(input.frame) : nothing}
@@ -363,7 +358,7 @@ function renderDocumentSection(input: FrameDetailsViewInput): LitTemplate {
363358
}
364359

365360
function renderSourcesLinkForURL(onRevealInSources: () => void): LitTemplate {
366-
return renderIconLink(
361+
return ApplicationComponents.PermissionsPolicySection.renderIconLink(
367362
'label',
368363
i18nString(UIStrings.clickToOpenInSourcesPanel),
369364
onRevealInSources,
@@ -372,7 +367,7 @@ function renderSourcesLinkForURL(onRevealInSources: () => void): LitTemplate {
372367
}
373368

374369
function renderNetworkLinkForURL(onRevealInNetwork: () => void): LitTemplate {
375-
return renderIconLink(
370+
return ApplicationComponents.PermissionsPolicySection.renderIconLink(
376371
'arrow-up-down-circle', i18nString(UIStrings.clickToOpenInNetworkPanel), onRevealInNetwork, 'reveal-in-network');
377372
}
378373

@@ -394,7 +389,7 @@ function maybeRenderUnreachableURL(unreachableUrl: Platform.DevToolsPath.UrlStri
394389
function renderNetworkLinkForUnreachableURL(unreachableUrlString: Platform.DevToolsPath.UrlString): LitTemplate {
395390
const unreachableUrl = Common.ParsedURL.ParsedURL.fromString(unreachableUrlString);
396391
if (unreachableUrl) {
397-
return renderIconLink(
392+
return ApplicationComponents.PermissionsPolicySection.renderIconLink(
398393
'arrow-up-down-circle',
399394
i18nString(UIStrings.clickToOpenInNetworkPanelMight),
400395
():
@@ -464,7 +459,7 @@ function maybeRenderCreationStacktrace(
464459
<devtools-resources-stack-trace .data=${{
465460
creationStackTraceData,
466461
buildStackTraceRows: Components.JSPresentationUtils.buildStackTraceRowsForLegacyRuntimeStackTrace,
467-
} as StackTraceData}>
462+
} as ApplicationComponents.StackTrace.StackTraceData}>
468463
</devtools-resources-stack-trace>
469464
</devtools-report-value>
470465
`;

‎front_end/panels/application/components/OriginTrialTreeView.test.ts‎ renamed to ‎front_end/panels/application/OriginTrialTreeView.test.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import * as Protocol from '../../../generated/protocol.js';
5+
import * as Protocol from '../../generated/protocol.js';
66
import {
77
renderElementIntoDOM,
8-
} from '../../../testing/DOMHelpers.js';
9-
import {describeWithLocale} from '../../../testing/LocaleHelpers.js';
10-
import type * as UI from '../../../ui/legacy/legacy.js';
8+
} from '../../testing/DOMHelpers.js';
9+
import {describeWithLocale} from '../../testing/LocaleHelpers.js';
10+
import type * as UI from '../../ui/legacy/legacy.js';
1111

12-
import * as ApplicationComponents from './components.js';
12+
import * as Application from './application.js';
1313

1414
async function renderOriginTrialTreeView(
15-
data: ApplicationComponents.OriginTrialTreeView.OriginTrialTreeViewData,
16-
): Promise<ApplicationComponents.OriginTrialTreeView.OriginTrialTreeView> {
17-
const component = new ApplicationComponents.OriginTrialTreeView.OriginTrialTreeView();
15+
data: Application.OriginTrialTreeView.OriginTrialTreeViewData,
16+
): Promise<Application.OriginTrialTreeView.OriginTrialTreeView> {
17+
const component = new Application.OriginTrialTreeView.OriginTrialTreeView();
1818
component.data = data;
1919
renderElementIntoDOM(component);
2020
await component.updateComplete;
@@ -25,7 +25,7 @@ async function renderOriginTrialTreeView(
2525
* Extract `TreeOutline` component from `OriginTrialTreeView` for inspection.
2626
*/
2727
async function renderOriginTrialTreeViewTreeOutline(
28-
data: ApplicationComponents.OriginTrialTreeView.OriginTrialTreeViewData,
28+
data: Application.OriginTrialTreeView.OriginTrialTreeViewData,
2929
): Promise<{
3030
component: UI.TreeOutline.TreeElement,
3131
shadowRoot: ShadowRoot,

‎front_end/panels/application/components/OriginTrialTreeView.ts‎ renamed to ‎front_end/panels/application/OriginTrialTreeView.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import '../../../ui/components/icon_button/icon_button.js';
6-
import '../../../ui/legacy/legacy.js';
7-
import '../../../ui/components/adorners/adorners.js';
5+
import '../../ui/components/icon_button/icon_button.js';
6+
import '../../ui/legacy/legacy.js';
7+
import '../../ui/components/adorners/adorners.js';
88

9-
import * as i18n from '../../../core/i18n/i18n.js';
10-
import * as Protocol from '../../../generated/protocol.js';
11-
import type * as TreeOutline from '../../../ui/components/tree_outline/tree_outline.js';
12-
import * as UI from '../../../ui/legacy/legacy.js';
13-
import {Directives, html, type LitTemplate, nothing, render, type TemplateResult} from '../../../ui/lit/lit.js';
9+
import * as i18n from '../../core/i18n/i18n.js';
10+
import * as Protocol from '../../generated/protocol.js';
11+
import type * as TreeOutline from '../../ui/components/tree_outline/tree_outline.js';
12+
import * as UI from '../../ui/legacy/legacy.js';
13+
import {Directives, html, type LitTemplate, nothing, render, type TemplateResult} from '../../ui/lit/lit.js';
1414

1515
import originTrialTokenRowsStyles from './originTrialTokenRows.css.js';
1616
import originTrialTreeViewStyles from './originTrialTreeView.css.js';
@@ -70,7 +70,7 @@ const UIStrings = {
7070
*/
7171
noTrialTokens: 'No trial tokens',
7272
} as const;
73-
const str_ = i18n.i18n.registerUIStrings('panels/application/components/OriginTrialTreeView.ts', UIStrings);
73+
const str_ = i18n.i18n.registerUIStrings('panels/application/OriginTrialTreeView.ts', UIStrings);
7474
const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
7575

7676
type TreeNode<DataType> = TreeOutline.TreeOutlineUtils.TreeNode<DataType>;

0 commit comments

Comments
 (0)