Skip to content
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

chore(edit-content): Use new Angular Syntax in DotNavigationComponent #30403

Merged
merged 9 commits into from
Oct 21, 2024
+265 −233
Merged

chore(edit-content): Use new Angular Syntax in DotNavigationComponent #30403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b7c3bbc
chore(edit-content): migrate using the new syntax and signals #30401
nicobytes Oct 18, 2024
c6e0e4e
chore(edit-content): add docs #30401
nicobytes Oct 18, 2024
ef709ab
chore(edit-content): remove import #30401
nicobytes Oct 18, 2024
cbf390b
chore(edit-content): apply format #30401
nicobytes Oct 18, 2024
9bd4653
chore(edit-content): use signal #30389
nicobytes Oct 18, 2024
232d47d
chore(edit-content): fix unit tests #30401
nicobytes Oct 21, 2024
f25f58b
chore(edit-content): fix unit tests #30401
nicobytes Oct 21, 2024
ffc22df
chore(edit-content): fix unit tests #30401
nicobytes Oct 21, 2024
854930e
Merge branch 'main' into 30401-use-new-angular-syntax-in-dotnavigatio…
nicobytes Oct 21, 2024
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
13 changes: 5 additions & 8 deletions ...rc/app/view/components/dot-navigation/components/dot-nav-icon/dot-nav-icon.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
<i
*ngIf="isFaIcon(icon); else mdIcon"
[style.font-size.px]="18"
class="fa fa-th-list {{ icon }}"
aria-hidden="true"></i>
<ng-template #mdIcon>
<dot-icon [size]="18" [name]="icon.toLocaleLowerCase()" inverted aria-hidden="true"></dot-icon>
</ng-template>
@if (isFaIcon(icon)) {
<i [style.font-size.px]="18" class="fa fa-th-list {{ icon }}" aria-hidden="true"></i>
} @else {
<dot-icon [size]="18" [name]="icon.toLocaleLowerCase()" inverted aria-hidden="true" />
}
22 changes: 12 additions & 10 deletions .../src/app/view/components/dot-navigation/components/dot-sub-nav/dot-sub-nav.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<ul [class.dot-nav-sub__collapsed]="collapsed" #ul class="dot-nav-sub">
<li *ngFor="let subItem of data.menuItems" class="dot-nav-sub__item">
<a
(click)="onItemClick($event, subItem)"
[class.dot-nav-sub__link--active]="subItem.active"
[routerLink]="subItem.menuLink"
[state]="{ menuId: data.id }"
class="dot-nav-sub__link">
{{ subItem.label }}
</a>
</li>
@for (subItem of data.menuItems; track subItem) {
<li class="dot-nav-sub__item">
<a
(click)="onItemClick($event, subItem)"
[class.dot-nav-sub__link--active]="subItem.active"
[routerLink]="subItem.menuLink"
[state]="{ menuId: data.id }"
class="dot-nav-sub__link">
{{ subItem.label }}
</a>
</li>
}
</ul>
22 changes: 11 additions & 11 deletions core-web/apps/dotcms-ui/src/app/view/components/dot-navigation/dot-navigation.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<nav [class.collapsed]="dotNavigationService.collapsed$ | async" role="navigation">
@let isCollapsed = $isCollapsed();
<nav [class.collapsed]="isCollapsed" role="navigation">
<ul class="dot-nav">
<li
*ngFor="let item of menu$ | async"
[class.dot-nav__list-item--active]="item.isOpen"
class="dot-nav__list-item">
<dot-nav-item
(menuClick)="onMenuClick($event)"
(itemClick)="onItemClick($event)"
[data]="item"
[collapsed]="dotNavigationService.collapsed$ | async"></dot-nav-item>
</li>
@for (item of $menu(); track item) {
<li [class.dot-nav__list-item--active]="item.isOpen" class="dot-nav__list-item">
<dot-nav-item
(menuClick)="onMenuClick($event)"
(itemClick)="onItemClick($event)"
[data]="item"
[collapsed]="isCollapsed" />
</li>
}
</ul>
</nav>
Loading