Skip to content

refactor(devtools): convert router details panel to description list #69137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
eduhmc wants to merge 1 commit into
base: main
Choose a base branch
from
+85 −45
Draft

refactor(devtools): convert router details panel to description list #69137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...ols/src/lib/devtools-tabs/router-tree/router-details-row/route-details-row.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- TODO: Reconsider the existence of this component. -->
<th>{{ label() }}</th>
<td>
<dt>{{ label() }}</dt>
<dd>
@switch (type()) {
@case ('flag') {
<span [class]="rowValue() ? 'tag-active' : 'tag-inactive'">
Expand Down Expand Up @@ -45,7 +45,7 @@
}
}
}
</td>
</dd>

<ng-template #actionBtn let-value="value">
@if (actionBtnType() !== 'none') {
Expand Down
2 changes: 1 addition & 1 deletion ...ols/src/lib/devtools-tabs/router-tree/router-details-row/route-details-row.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ button {
}
}

td {
dd {
width: 100%;
}

Expand Down
14 changes: 7 additions & 7 deletions .../src/lib/devtools-tabs/router-tree/router-details-row/route-details-row.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ describe('RouteDetailsRowComponent', () => {
fixture.componentRef.setInput('dataKey', 'value');
await fixture.whenStable();

const labelElement = fixture.debugElement.query(By.css('th'));
const labelElement = fixture.debugElement.query(By.css('dt'));
expect(labelElement.nativeElement.innerText).toEqual('Route Title');

const dataElements = fixture.debugElement.queryAll(By.css('td'));
const dataElements = fixture.debugElement.queryAll(By.css('dd'));
expect(dataElements.length).toEqual(1);
expect(dataElements[0].nativeElement.innerText).toEqual('Route Data');
});
Expand All @@ -48,7 +48,7 @@ describe('RouteDetailsRowComponent', () => {
fixture.componentRef.setInput('dataKey', 'isActive');
await fixture.whenStable();

const labelElement = fixture.debugElement.query(By.css('th'));
const labelElement = fixture.debugElement.query(By.css('dt'));
expect(labelElement.nativeElement.innerText).toEqual('Route Title');

const dataElements = fixture.debugElement.queryAll(By.css('.tag-active'));
Expand All @@ -62,7 +62,7 @@ describe('RouteDetailsRowComponent', () => {
fixture.componentRef.setInput('dataKey', 'isLazy');
await fixture.whenStable();

const labelElement = fixture.debugElement.query(By.css('th'));
const labelElement = fixture.debugElement.query(By.css('dt'));
expect(labelElement.nativeElement.innerText).toEqual('Route Title');

const dataElements = fixture.debugElement.queryAll(By.css('.tag-inactive'));
Expand All @@ -77,7 +77,7 @@ describe('RouteDetailsRowComponent', () => {
fixture.componentRef.setInput('actionBtnType', 'view-source');
await fixture.whenStable();

const labelElement = fixture.debugElement.query(By.css('th'));
const labelElement = fixture.debugElement.query(By.css('dt'));
expect(labelElement.nativeElement.innerText).toEqual('Route Title');

const dataElements = fixture.debugElement.queryAll(By.css('button'));
Expand All @@ -92,7 +92,7 @@ describe('RouteDetailsRowComponent', () => {
fixture.componentRef.setInput('actionBtnDisabled', true);
await fixture.whenStable();

const labelElement = fixture.debugElement.query(By.css('th'));
const labelElement = fixture.debugElement.query(By.css('dt'));
expect(labelElement.nativeElement.innerText).toEqual('Route Title');

const dataElements = fixture.debugElement.queryAll(By.css('button'));
Expand All @@ -107,7 +107,7 @@ describe('RouteDetailsRowComponent', () => {
fixture.componentRef.setInput('actionBtnType', 'view-source');
await fixture.whenStable();

const labelElement = fixture.debugElement.query(By.css('th'));
const labelElement = fixture.debugElement.query(By.css('dt'));
expect(labelElement.nativeElement.innerText).toEqual('Route Title');

const dataElements = fixture.debugElement.queryAll(By.css('button'));
Expand Down
79 changes: 45 additions & 34 deletions devtools/projects/ng-devtools/src/lib/devtools-tabs/router-tree/router-tree.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,31 +48,31 @@ <h2 class="router-title">Routes Details</h2>

<!-- TODO: Convert to a description list (<dl>) -->
<div class="scrollable-wrapper">
<table class="ng-table">
<dl class="ng-dl">
@if (!data.matcher) {
<tr
<div
ng-route-details-row
label="Path"
dataKey="path"
[data]="data"
actionBtnType="navigate"
[actionBtnTooltip]="'Navigate to ' + data.path"
(actionBtnClick)="navigateRoute(route)"
></tr>
></div>
} @else {
<tr
<div
ng-route-details-row
label="Matcher"
dataKey="matcher"
[data]="data"
actionBtnType="view-source"
actionBtnTooltip="View source"
(actionBtnClick)="viewFunctionSource(data.matcher, 'matcher')"
></tr>
></div>
}

@if (!data.redirectTo) {
<tr
<div
ng-route-details-row
label="Component"
dataKey="component"
Expand All @@ -81,45 +81,50 @@ <h2 class="router-title">Routes Details</h2>
actionBtnTooltip="View source"
[actionBtnDisabled]="!!data?.isLazy"
(actionBtnClick)="viewComponentSource(data.component)"
></tr>
></div>
} @else {
<tr
<div
ng-route-details-row
label="Redirect to"
dataKey="redirectTo"
[data]="data"
actionBtnType="view-source"
actionBtnTooltip="View source"
(actionBtnClick)="viewFunctionSource(data.redirectTo, 'redirectTo')"
></tr>
></div>
}

@if (data.pathMatch) {
<tr ng-route-details-row label="Path Match" dataKey="pathMatch" [data]="data"></tr>
<div
ng-route-details-row
label="Path Match"
dataKey="pathMatch"
[data]="data"
></div>
}
@if (data.data) {
<tr
<div
ng-route-details-row
label="Data"
[renderValueAsJson]="true"
dataKey="data"
[data]="data"
></tr>
></div>
}
@if (data.resolvers) {
<tr
<div
ng-route-details-row
label="Resolvers"
[renderValueAsJson]="true"
dataKey="resolvers"
[data]="data"
actionBtnType="view-source"
(actionBtnClick)="viewSourceFromRouter($event, 'resolvers')"
></tr>
></div>
}

@if (data.canActivateGuards && data.canActivateGuards.length > 0) {
<tr
<div
ng-route-details-row
label="Can Activate Guards"
type="list"
Expand All @@ -128,20 +133,20 @@ <h2 class="router-title">Routes Details</h2>
actionBtnType="view-source"
actionBtnTooltip="View source"
(actionBtnClick)="viewSourceFromRouter($event, 'canActivate')"
></tr>
></div>
}
@if (data.canActivateChildGuards && data.canActivateChildGuards.length > 0) {
<tr
<div
ng-route-details-row
label="Can Activate Child Guards"
type="list"
dataKey="canActivateChildGuards"
[data]="data"
(actionBtnClick)="viewSourceFromRouter($event, 'canActivateChild')"
></tr>
></div>
}
@if (data.canDeactivateGuards && data.canDeactivateGuards.length > 0) {
<tr
<div
ng-route-details-row
label="Can DeActivate Guards"
type="list"
Expand All @@ -150,10 +155,10 @@ <h2 class="router-title">Routes Details</h2>
actionBtnType="view-source"
actionBtnTooltip="View source"
(actionBtnClick)="viewSourceFromRouter($event, 'canDeactivate')"
></tr>
></div>
}
@if (data.canMatchGuards && data.canMatchGuards.length > 0) {
<tr
<div
ng-route-details-row
label="Can Match Guards"
type="list"
Expand All @@ -162,11 +167,11 @@ <h2 class="router-title">Routes Details</h2>
actionBtnType="view-source"
actionBtnTooltip="View source"
(actionBtnClick)="viewSourceFromRouter($event, 'canMatch')"
></tr>
></div>
}

@if (data.providers && data.providers.length > 0) {
<tr
<div
ng-route-details-row
label="Providers"
type="list"
Expand All @@ -175,22 +180,22 @@ <h2 class="router-title">Routes Details</h2>
actionBtnType="view-source"
actionBtnTooltip="View source"
(actionBtnClick)="viewSourceFromRouter($event, 'providers')"
></tr>
></div>
}
@if (data.title) {
<tr
<div
ng-route-details-row
label="Title"
dataKey="title"
[data]="data"
actionBtnType="view-source"
actionBtnTooltip="View source"
(actionBtnClick)="viewFunctionSource(data.title, 'title')"
></tr>
></div>
}

@if (data.runGuardsAndResolvers) {
<tr
<div
ng-route-details-row
label="RunGuardsAndResolvers"
dataKey="runGuardsAndResolvers"
Expand All @@ -200,25 +205,31 @@ <h2 class="router-title">Routes Details</h2>
(actionBtnClick)="
viewFunctionSource(data.runGuardsAndResolvers, 'runGuardsAndResolvers')
"
></tr>
></div>
}

<tr
<div
ng-route-details-row
label="Active"
type="flag"
dataKey="isActive"
[data]="data"
></tr>
<tr
></div>
<div
ng-route-details-row
label="Auxiliary"
type="flag"
dataKey="isAux"
[data]="data"
></tr>
<tr ng-route-details-row label="Lazy" type="flag" dataKey="isLazy" [data]="data"></tr>
</table>
></div>
<div
ng-route-details-row
label="Lazy"
type="flag"
dataKey="isLazy"
[data]="data"
></div>
</dl>
</div>
</div>
</as-split-area>
Expand Down
29 changes: 29 additions & 0 deletions devtools/projects/ng-devtools/src/styles/_tables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,32 @@ table.ng-table {
padding: 0.625rem 0.375rem;
}
}

dl.ng-dl {
width: 100%;
margin: 0;

> div,
> [ng-route-details-row] {
display: flex;
align-items: center;
border-bottom: 1px solid var(--senary-contrast);
padding: 0.625rem 0.375rem;

dt {
@extend %body-bold-01;
margin: 0;
flex: 0 0 30%;
overflow: hidden;
text-overflow: ellipsis;
}

dd {
@extend %body-01;
margin: 0;
flex: 1;
overflow: hidden;
text-overflow: ellipsis;
}
}
}
Loading