[Angular] Mograte to signals (sort-by.directive.ts)

qmonmert · Dec 15, 2024 · 4f81e08 · 4f81e08
1 parent c0a81fe
commit 4f81e08
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/generators/angular/templates/src/main/webapp/app/shared/sort/sort-by.directive.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/shared/sort/sort-by.directive.spec.ts.ejs
@@ -77,7 +77,7 @@ describe('Directive: SortByDirective', () => {
     fixture.detectChanges();
 
     // THEN
-    expect(sortByDirective.<%= jhiPrefix %>SortBy).toEqual('name');
+    expect(sortByDirective.<%= jhiPrefix %>SortBy()).toEqual('name');
     expect(sortByDirective.iconComponent()?.icon).toEqual(faSort.iconName);
   });
 
@@ -90,7 +90,7 @@ describe('Directive: SortByDirective', () => {
     fixture.detectChanges();
 
     // THEN
-    expect(sortByDirective.<%= jhiPrefix %>SortBy).toEqual('name');
+    expect(sortByDirective.<%= jhiPrefix %>SortBy()).toEqual('name');
     expect(sortByDirective.iconComponent()?.icon).toEqual(faSortUp.iconName);
   });
 
@@ -103,7 +103,7 @@ describe('Directive: SortByDirective', () => {
     fixture.detectChanges();
 
     // THEN
-    expect(sortByDirective.<%= jhiPrefix %>SortBy).toEqual('name');
+    expect(sortByDirective.<%= jhiPrefix %>SortBy()).toEqual('name');
     expect(sortByDirective.iconComponent()?.icon).toEqual(faSortDown.iconName);
   });
 
@@ -116,7 +116,7 @@ describe('Directive: SortByDirective', () => {
     fixture.detectChanges();
 
     // THEN
-    expect(sortByDirective.<%= jhiPrefix %>SortBy).toEqual('name');
+    expect(sortByDirective.<%= jhiPrefix %>SortBy()).toEqual('name');
     expect(sortByDirective.iconComponent()?.icon).toEqual(faSort.iconName);
   });
 

diff --git a/generators/angular/templates/src/main/webapp/app/shared/sort/sort-by.directive.ts.ejs b/generators/angular/templates/src/main/webapp/app/shared/sort/sort-by.directive.ts.ejs
@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { Directive, HostListener, Input, contentChild, effect, inject } from '@angular/core';
+import { Directive, HostListener, contentChild, effect, inject, input } from '@angular/core';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { faSort, faSortDown, faSortUp, IconDefinition } from '@fortawesome/free-solid-svg-icons';
 
@@ -26,7 +26,7 @@ import { SortDirective } from './sort.directive';
   selector: '[<%= jhiPrefix %>SortBy]',
 })
 export class SortByDirective {
-  @Input() <%= jhiPrefix %>SortBy!: string;
+  readonly <%= jhiPrefix %>SortBy = input.required<string>();
 
   iconComponent = contentChild(FaIconComponent);
 
@@ -41,7 +41,7 @@ export class SortByDirective {
       if (this.iconComponent()) {
         let icon: IconDefinition = this.sortIcon;
         const { predicate, order } = this.sort.sortState();
-        if (predicate === this.<%= jhiPrefix %>SortBy && order !== undefined) {
+        if (predicate === this.<%= jhiPrefix %>SortBy() && order !== undefined) {
           icon = order === 'asc' ? this.sortAscIcon : this.sortDescIcon;
         }
         this.iconComponent()!.icon = icon.iconName;
@@ -53,7 +53,7 @@ export class SortByDirective {
   @HostListener('click')
   onClick(): void {
     if (this.iconComponent()) {
-      this.sort.sort(this.<%= jhiPrefix %>SortBy);
+      this.sort.sort(this.<%= jhiPrefix %>SortBy());
     }
   }
 }