-
-
-
diff --git a/src/app/layout/footer/footer.component.html b/src/app/layout/footer/footer.component.html
index 89db3b045..85e516965 100644
--- a/src/app/layout/footer/footer.component.html
+++ b/src/app/layout/footer/footer.component.html
@@ -1,20 +1,20 @@
diff --git a/src/app/layout/header/header.component.html b/src/app/layout/header/header.component.html
index 619c200c9..604aa2117 100644
--- a/src/app/layout/header/header.component.html
+++ b/src/app/layout/header/header.component.html
@@ -1,35 +1,37 @@
-
-
-
-
+
-
+
-
@@ -19,13 +19,15 @@
Username
account_circle
- Username is required
+ matInput
+ type="text"
+ placeholder="User Name"
+ formControlName="username"
+ aria-describedby="username-error"
+ />
+ @if (loginForm.controls['username'].errors?.required) {
+ Username is required
+ }
@@ -38,7 +40,7 @@
formControlName="password"
(keydown.enter)="$event.preventDefault(); onSubmit()"
aria-describedby="password-error"
- />
+ />
- Password is required
+ @if (loginForm.controls['password'].errors?.required) {
+ Password is required
+ }
- Please complete
+ @if (newEditPreprocessorForm.invalid && newEditPreprocessorForm.touched) {
+ Please complete
all required fields!
+ }
\ No newline at end of file
diff --git a/src/app/config/engine/preprocessors/new_edit-preprocessor/new_edit-preprocessor.component.spec.ts b/src/app/config/engine/preprocessors/new_edit-preprocessor/new_edit-preprocessor.component.spec.ts
index dac45f20f..2bf5bc354 100644
--- a/src/app/config/engine/preprocessors/new_edit-preprocessor/new_edit-preprocessor.component.spec.ts
+++ b/src/app/config/engine/preprocessors/new_edit-preprocessor/new_edit-preprocessor.component.spec.ts
@@ -49,6 +49,19 @@ describe('NewEditPreprocessorComponent', () => {
fixture.detectChanges(); // triggers ngOnInit and loads permissions
});
+ /**
+ * Helper to check page title and button text
+ * @param title Title text
+ * @param buttonText Button text
+ */
+ function expectPageTitleAndButton(title: string, buttonText: string) {
+ const buttonDebugEl = fixture.debugElement.query(By.css('[data-testid="submit-button-newPreprocessor"]'));
+ expect(buttonDebugEl.nativeElement.textContent).toContain(buttonText);
+
+ const subtitleEl = fixture.nativeElement.querySelector('app-page-subtitle');
+ expect(subtitleEl.textContent).toContain(title);
+ }
+
it('should create component and form', () => {
expect(component).toBeTruthy();
expect(component.newEditPreprocessorForm).toBeTruthy();
@@ -191,11 +204,10 @@ describe('NewEditPreprocessorComponent', () => {
expect(errors).toBeNull();
});
- it('should be the page title "New Preprocessor" and the button name "Create" in the New-Modus', () => {
+ it('should display the page title "New Preprocessor" and button name "Create" in New mode', () => {
const activatedRoute = TestBed.inject(ActivatedRoute);
-
- // simulate new-modus (no id)
activatedRoute.snapshot.paramMap.get = () => null;
+
fixture = TestBed.createComponent(NewEditPreprocessorComponent);
component = fixture.componentInstance;
fixture.detectChanges();
@@ -203,16 +215,11 @@ describe('NewEditPreprocessorComponent', () => {
expect(component.pageTitle).toBe('New Preprocessor');
expect(component.submitButtonText).toBe('Create');
- const buttonDebugElNew = fixture.debugElement.query(By.css('[data-testid="submit-button-newPreprocessor"]'));
- expect(buttonDebugElNew.componentInstance.name).toBe('Create');
- const subtitleElNew = fixture.nativeElement.querySelector('app-page-subtitle');
- expect(subtitleElNew.getAttribute('ng-reflect-subtitle')).toBe('New Preprocessor');
+ expectPageTitleAndButton('New Preprocessor', 'Create');
});
- it('should display the page title "Edit Preprocessor" and the button name "Update" at Route /config/engine/preprocessors/9/edit', () => {
+ it('should display the page title "Edit Preprocessor" and button name "Update" in Edit mode', () => {
const activatedRoute = TestBed.inject(ActivatedRoute);
-
- // simulate edit-modus route with id=9
activatedRoute.snapshot.paramMap.get = () => '9';
mockGlobalService.get.and.returnValue(of({ data: {}, included: [] }));
@@ -223,10 +230,7 @@ describe('NewEditPreprocessorComponent', () => {
expect(component.pageTitle).toBe('Edit Preprocessor');
expect(component.submitButtonText).toBe('Update');
- const buttonDebugElEdit = fixture.debugElement.query(By.css('[data-testid="submit-button-newPreprocessor"]'));
- expect(buttonDebugElEdit.componentInstance.name).toBe('Update');
- const subtitleElEdit = fixture.nativeElement.querySelector('app-page-subtitle');
- expect(subtitleElEdit.getAttribute('ng-reflect-subtitle')).toBe('Edit Preprocessor');
+ expectPageTitleAndButton('Edit Preprocessor', 'Update');
});
it('should call create and navigate on valid form if no id is present in route', async () => {
diff --git a/src/app/config/engine/preprocessors/new_edit-preprocessor/new_edit-preprocessor.component.ts b/src/app/config/engine/preprocessors/new_edit-preprocessor/new_edit-preprocessor.component.ts
index 6a44c9e6a..12a684dc8 100644
--- a/src/app/config/engine/preprocessors/new_edit-preprocessor/new_edit-preprocessor.component.ts
+++ b/src/app/config/engine/preprocessors/new_edit-preprocessor/new_edit-preprocessor.component.ts
@@ -1,61 +1,51 @@
-import { Subscription, firstValueFrom } from 'rxjs';
+import { Subscription, firstValueFrom } from 'rxjs'
-import { NgIf } from '@angular/common';
-import { Component, OnInit } from '@angular/core';
-import { FlexModule } from '@angular/flex-layout';
-import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { ActivatedRoute, Router } from '@angular/router';
+import { Component, OnInit } from '@angular/core'
+import { FlexModule } from '@angular/flex-layout'
+import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { ActivatedRoute, Router } from '@angular/router'
-import { JPreprocessor } from '@models/preprocessor.model';
-import { ResponseWrapper } from '@models/response.model';
+import { JPreprocessor } from '@models/preprocessor.model'
+import { ResponseWrapper } from '@models/response.model'
-import { JsonAPISerializer } from '@services/api/serializer-service';
-import { SERV, ValidationPatterns } from '@services/main.config';
-import { GlobalService } from '@services/main.service';
-import { RequestParamBuilder } from '@services/params/builder-implementation.service';
-import { AlertService } from '@services/shared/alert.service';
+import { JsonAPISerializer } from '@services/api/serializer-service'
+import { SERV, ValidationPatterns } from '@services/main.config'
+import { GlobalService } from '@services/main.service'
+import { RequestParamBuilder } from '@services/params/builder-implementation.service'
+import { AlertService } from '@services/shared/alert.service'
import {
NewEditPreprocessorForm,
getNewEditPreprocessorForm
-} from '@src/app/config/engine/preprocessors/new_edit-preprocessor/new_edit-preprocessor.form';
-import { ButtonsModule } from '@src/app/shared/buttons/buttons.module';
-import { GridModule } from '@src/app/shared/grid-containers/grid.module';
-import { InputModule } from '@src/app/shared/input/input.module';
-import { PageTitleModule } from '@src/app/shared/page-headers/page-title.module';
+} from '@src/app/config/engine/preprocessors/new_edit-preprocessor/new_edit-preprocessor.form'
+import { ButtonsModule } from '@src/app/shared/buttons/buttons.module'
+import { GridModule } from '@src/app/shared/grid-containers/grid.module'
+import { InputModule } from '@src/app/shared/input/input.module'
+import { PageTitleModule } from '@src/app/shared/page-headers/page-title.module'
@Component({
selector: 'app-new-preprocessor',
- imports: [
- ButtonsModule,
- FlexModule,
- FormsModule,
- GridModule,
- InputModule,
- NgIf,
- PageTitleModule,
- ReactiveFormsModule
- ],
+ imports: [ButtonsModule, FlexModule, FormsModule, GridModule, InputModule, PageTitleModule, ReactiveFormsModule],
templateUrl: './new_edit-preprocessor.component.html'
})
export class NewEditPreprocessorComponent implements OnInit {
- urlPattern = ValidationPatterns.URL;
+ urlPattern = ValidationPatterns.URL
- pageTitle = 'New Preprocessor';
- submitButtonText = 'Create';
+ pageTitle = 'New Preprocessor'
+ submitButtonText = 'Create'
- isEditMode = false;
- preprocessorId: number | null = null;
+ isEditMode = false
+ preprocessorId: number | null = null
- newEditPreprocessorForm: FormGroup;
+ newEditPreprocessorForm: FormGroup
- loading: boolean;
+ loading: boolean
/**
* Array to hold subscriptions for cleanup on component destruction.
* This prevents memory leaks by unsubscribing from observables when the component is destroyed.
*/
- subscriptions: Subscription[] = [];
+ subscriptions: Subscription[] = []
constructor(
private route: ActivatedRoute,
@@ -63,18 +53,18 @@ export class NewEditPreprocessorComponent implements OnInit {
private router: Router,
private alert: AlertService
) {
- this.newEditPreprocessorForm = getNewEditPreprocessorForm();
- this.loading = false;
+ this.newEditPreprocessorForm = getNewEditPreprocessorForm()
+ this.loading = false
}
ngOnInit() {
- this.preprocessorId = parseInt(this.route.snapshot.paramMap.get('id'));
+ this.preprocessorId = parseInt(this.route.snapshot.paramMap.get('id'))
if (this.preprocessorId) {
- this.isEditMode = true;
- this.pageTitle = 'Edit Preprocessor';
- this.submitButtonText = 'Update';
+ this.isEditMode = true
+ this.pageTitle = 'Edit Preprocessor'
+ this.submitButtonText = 'Update'
- this.loadPreprocessor(this.preprocessorId);
+ this.loadPreprocessor(this.preprocessorId)
}
}
@@ -83,13 +73,13 @@ export class NewEditPreprocessorComponent implements OnInit {
* @param preprocessorId ID of the preprocessor to load
*/
private loadPreprocessor(preprocessorId: number) {
- const params = new RequestParamBuilder().create();
+ const params = new RequestParamBuilder().create()
this.subscriptions.push(
this.gs.get(SERV.PREPROCESSORS, preprocessorId, params).subscribe((response: ResponseWrapper) => {
const preprocessor = new JsonAPISerializer().deserialize({
data: response.data,
included: response.included
- });
+ })
this.newEditPreprocessorForm.patchValue({
name: preprocessor.name,
@@ -98,17 +88,17 @@ export class NewEditPreprocessorComponent implements OnInit {
keyspaceCommand: preprocessor.keyspaceCommand,
limitCommand: preprocessor.limitCommand,
skipCommand: preprocessor.skipCommand
- });
+ })
})
- );
+ )
}
/**
* Create new preprocessor upon form submission and redirect to preprocessor page on success
*/
async onSubmit() {
- if (this.newEditPreprocessorForm.invalid) return;
- this.loading = true;
+ if (this.newEditPreprocessorForm.invalid) return
+ this.loading = true
const payload = {
name: this.newEditPreprocessorForm.value.name,
@@ -117,34 +107,34 @@ export class NewEditPreprocessorComponent implements OnInit {
keyspaceCommand: this.newEditPreprocessorForm.value.keyspaceCommand,
limitCommand: this.newEditPreprocessorForm.value.limitCommand,
skipCommand: this.newEditPreprocessorForm.value.skipCommand
- };
+ }
if (this.isEditMode) {
try {
this.subscriptions.push(
this.gs.update(SERV.PREPROCESSORS, this.preprocessorId, payload).subscribe(() => {
- this.alert.showSuccessMessage('Preprocessor updated');
- void this.router.navigate(['config/engine/preprocessors']);
+ this.alert.showSuccessMessage('Preprocessor updated')
+ void this.router.navigate(['config/engine/preprocessors'])
})
- );
+ )
} catch (err) {
- const msg = 'Error updating preprocessor!';
- console.error(msg, err);
- this.alert.showErrorMessage(msg);
+ const msg = 'Error updating preprocessor!'
+ console.error(msg, err)
+ this.alert.showErrorMessage(msg)
} finally {
- this.loading = false;
+ this.loading = false
}
} else {
try {
- await firstValueFrom(this.gs.create(SERV.PREPROCESSORS, payload));
- this.alert.showSuccessMessage('Preprocessor created!');
- void this.router.navigate(['config/engine/preprocessors']);
+ await firstValueFrom(this.gs.create(SERV.PREPROCESSORS, payload))
+ this.alert.showSuccessMessage('Preprocessor created!')
+ void this.router.navigate(['config/engine/preprocessors'])
} catch (err) {
- const msg = 'Error creating preprocessor!';
- console.error(msg, err);
- this.alert.showErrorMessage(msg);
+ const msg = 'Error creating preprocessor!'
+ console.error(msg, err)
+ this.alert.showErrorMessage(msg)
} finally {
- this.loading = false;
+ this.loading = false
}
}
}
diff --git a/src/app/config/health-checks/new-health-check/new-health-checks.component.html b/src/app/config/health-checks/new-health-check/new-health-checks.component.html
index d4f0eabae..c7f14aee2 100644
--- a/src/app/config/health-checks/new-health-check/new-health-checks.component.html
+++ b/src/app/config/health-checks/new-health-check/new-health-checks.component.html
@@ -15,9 +15,11 @@
diff --git a/src/app/core/_components/confirm-dialog/confirm-dialog.component.html b/src/app/core/_components/confirm-dialog/confirm-dialog.component.html
index f2f3638e2..3cddfcc49 100644
--- a/src/app/core/_components/confirm-dialog/confirm-dialog.component.html
+++ b/src/app/core/_components/confirm-dialog/confirm-dialog.component.html
@@ -1,5 +1,7 @@
-
- No data available
-
-
-
-
-
-
-
-
-
-
diff --git a/src/app/core/_components/tables/ht-table/type/default/ht-table-type-default.component.html b/src/app/core/_components/tables/ht-table/type/default/ht-table-type-default.component.html
index 0f21658fa..59219820c 100644
--- a/src/app/core/_components/tables/ht-table/type/default/ht-table-type-default.component.html
+++ b/src/app/core/_components/tables/ht-table/type/default/ht-table-type-default.component.html
@@ -1,16 +1,14 @@
-
+@if (!tableColumn.routerLink && !tableColumn.editable && !tableColumn.checkbox) {
-
+ @if (tableColumn.async) {
-
+ }
-
+ @if (!tableColumn.async && tableColumn.render) {
-
+ }
-
+ @if (!tableColumn.async && !tableColumn.render && !tableColumn.icon) {
{{ element[tableColumn.dataKey] }}
-
-
+ }
+}
diff --git a/src/app/core/_components/tables/ht-table/type/editable/editable-checkbox/ht-table-type-editable-checkbox.component.html b/src/app/core/_components/tables/ht-table/type/editable/editable-checkbox/ht-table-type-editable-checkbox.component.html
index ebed5f6ac..d4bac3536 100644
--- a/src/app/core/_components/tables/ht-table/type/editable/editable-checkbox/ht-table-type-editable-checkbox.component.html
+++ b/src/app/core/_components/tables/ht-table/type/editable/editable-checkbox/ht-table-type-editable-checkbox.component.html
@@ -1,9 +1,12 @@
-
-
-
+@if (tableColumn.routerLink) {
+ @for (link of (tableColumn.routerLink(element) | async); track trackByFn($index, link)) {
+ @if (link.label || link.routerLink) {
-
+ @if (link.routerLink) {
-
+ @if (link.label) {
{{ link.label }}
-
-
+ } @else {
{{ element[tableColumn.dataKey] }}
-
-
+ }
+ @if (link.icon?.faIcon) {
+ }
-
-
-
-
+ } @else {
-
-
-
-
+ }
+
+ }
+ }
+}
diff --git a/src/app/core/_components/tables/table-dialog/table-dialog.component.html b/src/app/core/_components/tables/table-dialog/table-dialog.component.html
index cc430f151..69b6a5b8c 100644
--- a/src/app/core/_components/tables/table-dialog/table-dialog.component.html
+++ b/src/app/core/_components/tables/table-dialog/table-dialog.component.html
@@ -1,15 +1,23 @@
diff --git a/src/app/core/_components/tables/table-truncate/table-truncate.component.html b/src/app/core/_components/tables/table-truncate/table-truncate.component.html
index ef7f0d5b9..2093c7b74 100644
--- a/src/app/core/_components/tables/table-truncate/table-truncate.component.html
+++ b/src/app/core/_components/tables/table-truncate/table-truncate.component.html
@@ -1,4 +1,8 @@
;
-export type ThemeSaver = (theme: string | null) => void;
+import { DOCUMENT, Inject, Injectable, InjectionToken, Renderer2, RendererFactory2 } from '@angular/core'
+
+export type DetectedTheme = 'dark' | 'light'
+export type ThemeLoader = () => Observable
+export type ThemeSaver = (theme: string | null) => void
export const THEME_LOADER: InjectionToken = new InjectionToken('', {
factory(): ThemeLoader {
return () => {
if (typeof window === 'undefined' || typeof localStorage === 'undefined') {
- return of(null);
+ return of(null)
}
return fromEvent(window, 'storage').pipe(
filter((event) => event.key === 'theme' && event.storageArea === localStorage),
map((event) => event.newValue),
startWith(localStorage.getItem('theme'))
- );
- };
+ )
+ }
}
-});
+})
/**
* A function that saves the theme.
@@ -30,85 +30,80 @@ export const THEME_SAVER: InjectionToken = new InjectionToken {
if (typeof localStorage === 'undefined') {
- return;
+ return
}
if (theme) {
- localStorage.setItem('theme', theme);
+ localStorage.setItem('theme', theme)
} else {
- localStorage.removeItem('theme');
+ localStorage.removeItem('theme')
}
- };
+ }
}
-});
+})
export interface ThemeObject {
- oldValue: string;
- newValue: string;
+ oldValue: string
+ newValue: string
}
@Injectable({
providedIn: 'root'
})
export class ThemeService {
- private _theme = new BehaviorSubject(null);
+ private _theme = new BehaviorSubject(null)
public get current(): string {
- return localStorage.getItem('theme') ?? 'light';
+ return localStorage.getItem('theme') ?? 'light'
}
public set current(value: string) {
- localStorage.setItem('theme', value);
+ localStorage.setItem('theme', value)
}
- private readonly style: HTMLLinkElement;
+ private readonly style: HTMLLinkElement
- private renderer: Renderer2;
+ private renderer: Renderer2
constructor(
rendererFactory: RendererFactory2,
- @Inject(DOCUMENT) document: any,
- @Inject(THEME_LOADER) loadHandler: any,
- @Inject(THEME_SAVER) saveHandler: any
+ @Inject(DOCUMENT) private document: Document,
+ @Inject(THEME_LOADER) private loadHandler: ThemeLoader,
+ @Inject(THEME_SAVER) private saveHandler: ThemeSaver
) {
- (loadHandler as ThemeLoader)().subscribe((theme) => this._theme.next(theme));
-
- this.renderer = rendererFactory.createRenderer(null, null);
+ ;(loadHandler as ThemeLoader)().subscribe((theme) => this._theme.next(theme))
- this.style = document.createElement('link');
- this.style.rel = 'stylesheet';
- document.head.appendChild(this.style);
+ this.renderer = rendererFactory.createRenderer(null, null)
- if (localStorage.getItem('theme') !== undefined) {
- }
+ this.style = document.createElement('link')
+ this.style.rel = 'stylesheet'
+ document.head.appendChild(this.style)
this._theme.subscribe((theme) => {
if (theme) {
- this.renderer.removeClass(document.body, this.current);
- document.body.setAttribute('data-theme', theme);
- this.renderer.addClass(document.body, theme);
+ this.renderer.removeClass(document.body, this.current)
+ document.body.setAttribute('data-theme', theme)
+ this.renderer.addClass(document.body, theme)
} else {
- document.body.removeAttribute('data-theme');
- this.renderer.removeClass(document.body, this.current);
+ document.body.removeAttribute('data-theme')
+ this.renderer.removeClass(document.body, this.current)
}
- (saveHandler as ThemeSaver)(theme);
- });
+ ;(saveHandler as ThemeSaver)(theme)
+ })
}
/**
* @return a subject representing the currently active theme
*/
get theme$(): Subject {
- return this._theme;
+ return this._theme
}
/**
* @return `dark` if the user agent prefers dark color scheme, `light` otherwise
*/
get detectedTheme(): DetectedTheme {
- return typeof window !== 'undefined' && window.matchMedia('(prefers-color-scheme: dark)').matches
- ? 'dark'
- : 'light';
+ return typeof window !== 'undefined' && window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'
}
/**
@@ -117,21 +112,21 @@ export class ThemeService {
*/
get detectedTheme$(): Observable {
if (typeof window === 'undefined') {
- return of('light');
+ return of('light')
}
- const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
+ const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)')
return fromEvent(mediaQuery, 'change').pipe(
map((event) => event.matches),
startWith(mediaQuery.matches),
map((matches) => (matches ? 'dark' : 'light'))
- );
+ )
}
/**
* @return the current theme
*/
get theme(): string | null {
- return this._theme.getValue();
+ return this._theme.getValue()
}
/**
@@ -139,6 +134,6 @@ export class ThemeService {
* the new theme
*/
set theme(value: string | null) {
- this._theme.next(value);
+ this._theme.next(value)
}
}
diff --git a/src/app/files/files.component.html b/src/app/files/files.component.html
index d95f2daab..3a5d7f114 100644
--- a/src/app/files/files.component.html
+++ b/src/app/files/files.component.html
@@ -1,17 +1,17 @@
-
-
+ @switch (fileType) {
+ @case (FileType.WORDLIST) {
-
+ [subbutton]="true">
+ }
+ @case (FileType.RULES) {
-
+ [subbutton]="true">
+ }
+ @case (FileType.OTHER) {
-
+ [subbutton]="true">
+ }
+ }
diff --git a/src/app/files/new-files/new-files.component.html b/src/app/files/new-files/new-files.component.html
index d0bcf4432..4d32960ce 100644
--- a/src/app/files/new-files/new-files.component.html
+++ b/src/app/files/new-files/new-files.component.html
@@ -4,72 +4,77 @@
-
+
-
-
-
+
-
+
-
-
-
+ }
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 239ff1b52..f2b1f57e8 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,9 +1,11 @@
-
+
-
+
-
-
-
+@if (uiSettings.uiConfig) {
+
+
+
+
+}
-
+ @if (isLoading) {
+
+
+ }
diff --git a/src/app/config/engine/crackers/new-cracker/new-cracker.component.html b/src/app/config/engine/crackers/new-cracker/new-cracker.component.html
index 14faf9061..00f3a89c0 100644
--- a/src/app/config/engine/crackers/new-cracker/new-cracker.component.html
+++ b/src/app/config/engine/crackers/new-cracker/new-cracker.component.html
@@ -24,8 +24,10 @@
>
- Please complete all required fields!
+ @if (newCrackerForm.invalid && newCrackerForm.touched) {
+ Please complete all required fields!
+ }
diff --git a/src/app/config/engine/crackers/new-cracker/new-cracker.component.ts b/src/app/config/engine/crackers/new-cracker/new-cracker.component.ts
index d231959f4..92bfa09a8 100644
--- a/src/app/config/engine/crackers/new-cracker/new-cracker.component.ts
+++ b/src/app/config/engine/crackers/new-cracker/new-cracker.component.ts
@@ -1,70 +1,60 @@
-import { firstValueFrom } from 'rxjs';
+import { firstValueFrom } from 'rxjs'
-import { NgIf } from '@angular/common';
-import { Component } from '@angular/core';
-import { FlexModule } from '@angular/flex-layout';
-import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { Router } from '@angular/router';
+import { Component } from '@angular/core'
+import { FlexModule } from '@angular/flex-layout'
+import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { Router } from '@angular/router'
-import { SERV } from '@services/main.config';
-import { GlobalService } from '@services/main.service';
-import { AlertService } from '@services/shared/alert.service';
+import { SERV } from '@services/main.config'
+import { GlobalService } from '@services/main.service'
+import { AlertService } from '@services/shared/alert.service'
-import { NewCrackerForm, getNewCrackerForm } from '@src/app/config/engine/crackers/new-cracker/new-cracker.form';
-import { ButtonsModule } from '@src/app/shared/buttons/buttons.module';
-import { GridModule } from '@src/app/shared/grid-containers/grid.module';
-import { InputModule } from '@src/app/shared/input/input.module';
-import { PageTitleModule } from '@src/app/shared/page-headers/page-title.module';
+import { NewCrackerForm, getNewCrackerForm } from '@src/app/config/engine/crackers/new-cracker/new-cracker.form'
+import { ButtonsModule } from '@src/app/shared/buttons/buttons.module'
+import { GridModule } from '@src/app/shared/grid-containers/grid.module'
+import { InputModule } from '@src/app/shared/input/input.module'
+import { PageTitleModule } from '@src/app/shared/page-headers/page-title.module'
@Component({
selector: 'app-new-cracker',
- imports: [
- ButtonsModule,
- FlexModule,
- FormsModule,
- GridModule,
- InputModule,
- PageTitleModule,
- ReactiveFormsModule,
- NgIf
- ],
+ imports: [ButtonsModule, FlexModule, FormsModule, GridModule, InputModule, PageTitleModule, ReactiveFormsModule],
templateUrl: './new-cracker.component.html'
})
export class NewCrackerComponent {
- newCrackerForm: FormGroup;
- loading: boolean;
+ newCrackerForm: FormGroup
+ loading: boolean
constructor(
private gs: GlobalService,
private router: Router,
private alert: AlertService
) {
- this.newCrackerForm = getNewCrackerForm();
- this.loading = false;
+ this.newCrackerForm = getNewCrackerForm()
+ this.loading = false
}
/**
* Create new cracker upon form submission and redirect to cracker type table page on success
*/
async onSubmit() {
- if (this.newCrackerForm.invalid) return;
- this.loading = true;
+ if (this.newCrackerForm.invalid) return
+ this.loading = true
try {
const payload = {
typeName: this.newCrackerForm.value.typeName,
isChunkingAvailable: this.newCrackerForm.value.isChunkingAvailable
- };
+ }
- await firstValueFrom(this.gs.create(SERV.CRACKERS_TYPES, payload));
- this.alert.showSuccessMessage('Cracker type created!');
- void this.router.navigate(['config/engine/crackers']);
+ await firstValueFrom(this.gs.create(SERV.CRACKERS_TYPES, payload))
+ this.alert.showSuccessMessage('Cracker type created!')
+ void this.router.navigate(['config/engine/crackers'])
} catch (err) {
- const msg = 'Error creating cracker type';
- console.error(msg, err);
- this.alert.showErrorMessage(msg);
+ const msg = 'Error creating cracker type'
+ console.error(msg, err)
+ this.alert.showErrorMessage(msg)
} finally {
- this.loading = false;
+ this.loading = false
}
}
}
diff --git a/src/app/config/engine/preprocessors/new_edit-preprocessor/new_edit-preprocessor.component.html b/src/app/config/engine/preprocessors/new_edit-preprocessor/new_edit-preprocessor.component.html
index c50fd0b0f..50ac9ed29 100644
--- a/src/app/config/engine/preprocessors/new_edit-preprocessor/new_edit-preprocessor.component.html
+++ b/src/app/config/engine/preprocessors/new_edit-preprocessor/new_edit-preprocessor.component.html
@@ -7,25 +7,27 @@
Commands (set to empty if not available)
-
+ @if (isCreatingLoading) {
+
+
+ }
- {{ data.icon }}
+ @if (data.icon) {
+ {{ data.icon }}
+ }
{{ data.title || 'Confirm' }}
diff --git a/src/app/core/_components/forms/simple-forms/form.component.html b/src/app/core/_components/forms/simple-forms/form.component.html
index 0b1de8beb..a722e531c 100644
--- a/src/app/core/_components/forms/simple-forms/form.component.html
+++ b/src/app/core/_components/forms/simple-forms/form.component.html
@@ -1,12 +1,13 @@
-
-
+@if (isloaded) {
+
+
+}
diff --git a/src/app/core/_components/forms/simple-forms/formconfig.component.html b/src/app/core/_components/forms/simple-forms/formconfig.component.html
index abe4bc2f9..b510d3878 100644
--- a/src/app/core/_components/forms/simple-forms/formconfig.component.html
+++ b/src/app/core/_components/forms/simple-forms/formconfig.component.html
@@ -1,11 +1,12 @@
+@if (openOnMouseEnter) {
-
-
-
-
-
+ >
+ @for (section of actionMenuItems; track section; let last = $last) {
+ @for (item of section; track item) {
+
+ }
+ @if (!last) {
+
-
+}
-
+@if (!openOnMouseEnter) {
-
-
-
+ @for (section of actionMenuItems; track section; let last = $last) {
+ @for (item of section; track item) {
+
+ }
+ @if (!last) {
+
-
+}
diff --git a/src/app/core/_components/tables/column-selection-dialog/column-selection-dialog.component.html b/src/app/core/_components/tables/column-selection-dialog/column-selection-dialog.component.html
index c4a62ea9e..8e12ffeef 100644
--- a/src/app/core/_components/tables/column-selection-dialog/column-selection-dialog.component.html
+++ b/src/app/core/_components/tables/column-selection-dialog/column-selection-dialog.component.html
@@ -2,7 +2,9 @@
- {{ availableColumns[key] }}
+ @for (key of getKeys(); track key) {
+ {{ availableColumns[key] }}
+ }
diff --git a/src/app/core/_components/tables/ht-table/ht-table.component.html b/src/app/core/_components/tables/ht-table/ht-table.component.html
index cc88f0422..3873486a0 100644
--- a/src/app/core/_components/tables/ht-table/ht-table.component.html
+++ b/src/app/core/_components/tables/ht-table/ht-table.component.html
@@ -3,11 +3,13 @@
-
-
-
-
+
+ @if (isPageable) {
+
+ + } - -
- {{ icon.name }}
-
- {{ icon.name }}
-
-
-
-
-
- Select Columns
@@ -18,41 +20,43 @@
-
-
-
-
-
-
-
+ @if (isSelectable && contextMenuService && contextMenuService.getHasBulkMenu()) {
+
+ @if (dataSource.loading$ | async) {
+
+ } @else {
+
+ }
-
-
-
-
-
-
-
+ @if (isSelectable && showExport) {
+
+ @if (dataSource.loading$ | async) {
+
+ } @else {
+
+ }
|
-
- {{
+ @if (isSelectable) {
+ {{
isCmdLabel ? isCmdLabel : 'Task | Preprocessor'
}} Task |
+
- |
- - |
- |
- - {{ columnLabels[tableColumn.id] }} - | ++ |
+ |
- {{ columnLabels[tableColumn.id] }} - | -+ + @if (tableColumn.isSortable) { + | + {{ columnLabels[tableColumn.id] }} + | + } @else { ++ {{ columnLabels[tableColumn.id] }} + | + } + + +
-
- @if (tableColumn.isCopy) {
-
- }
- |
+
|---|
|
+ @if (dataSource.loading$ | async) {
+
+
+ } @else {
+ No data available
+ }
+ |
+
+ + } - -
-
- -
-
+@if (tableColumn.checkbox) {
+
+ @if (checkbox.value !== 'undefined') {
+
+}
diff --git a/src/app/core/_components/tables/ht-table/type/editable/editable-text/ht-table-type-editable.component.html b/src/app/core/_components/tables/ht-table/type/editable/editable-text/ht-table-type-editable.component.html
index 59251044d..76f537a79 100644
--- a/src/app/core/_components/tables/ht-table/type/editable/editable-text/ht-table-type-editable.component.html
+++ b/src/app/core/_components/tables/ht-table/type/editable/editable-text/ht-table-type-editable.component.html
@@ -1,44 +1,45 @@
-
-
-
-
-
-
-
-
-
-
-
+@if (tableColumn.editable) {
+
-
-
-
+ @if (editMode) {
+
+
+
+
+
+ } @else {
+
+}
diff --git a/src/app/core/_components/tables/ht-table/type/link/ht-table-type-link.component.html b/src/app/core/_components/tables/ht-table/type/link/ht-table-type-link.component.html
index 95b4674ed..215ef7fbf 100644
--- a/src/app/core/_components/tables/ht-table/type/link/ht-table-type-link.component.html
+++ b/src/app/core/_components/tables/ht-table/type/link/ht-table-type-link.component.html
@@ -1,41 +1,36 @@
-
+
+
+ }
+
-
-
- {{ link.label }}
-
-
- {{ element[tableColumn.dataKey] }}
-
-
-
-
+
+ @if (link.label) {
+ {{ link.label }}
+ } @else {
+ {{ element[tableColumn.dataKey] }}
+ }
+ @if (link.icon?.faIcon) {
+
-
- {{ data.icon }}
+ @if (data.icon) {
+ {{ data.icon }}
+ }
{{ data.title || 'Confirm' }}
-
-
-
- - {{ row[data.listAttribute] - }} - -
{{ data.body }}
+ @if (data.listAttribute && data.rows.length > 0) { +-
+ @for (row of data.rows; track row) {
+
- + {{ row[data.listAttribute] + }} + + } +
{{ data.body }}
+ }
-
diff --git a/src/app/core/_services/shared/theme.service.ts b/src/app/core/_services/shared/theme.service.ts
index 21447c9cd..fa6eb9197 100644
--- a/src/app/core/_services/shared/theme.service.ts
+++ b/src/app/core/_services/shared/theme.service.ts
@@ -1,26 +1,26 @@
-import { Inject, Injectable, InjectionToken, Renderer2, RendererFactory2 } from '@angular/core';
-import { DOCUMENT } from '@angular/common';
-import { BehaviorSubject, fromEvent, Observable, of, Subject } from 'rxjs';
-import { filter, map, startWith } from 'rxjs/operators';
+import { BehaviorSubject, Observable, Subject, fromEvent, of } from 'rxjs'
+import { filter, map, startWith } from 'rxjs/operators'
-export type DetectedTheme = 'dark' | 'light';
-export type ThemeLoader = () => Observable{{ abbr }}
- {{ text }}
+ @if (!expanded) {
+ {{ abbr }}
+ }
+ @if (expanded) {
+ {{ text }}
+ }
{{s.name}}
+@for (s of sizes; track s) {
+ {{s.name}}
+}
diff --git a/src/app/shared/alert/blacklisted-attack/blacklisted-attack.component.html b/src/app/shared/alert/blacklisted-attack/blacklisted-attack.component.html
index 707662e77..694346455 100644
--- a/src/app/shared/alert/blacklisted-attack/blacklisted-attack.component.html
+++ b/src/app/shared/alert/blacklisted-attack/blacklisted-attack.component.html
@@ -1,8 +1,10 @@
-
- Please remove the characters that are on the blacklist.
-
- BlackListed Chars: {{ blacklistedChars.join(', ') }} -
- + @if (hasErrors) { + + Please remove the characters that are on the blacklist. +
+ BlackListed Chars: {{ blacklistedChars.join(', ') }} +
+ + }
diff --git a/src/app/shared/alert/timeout/timeout.component.html b/src/app/shared/alert/timeout/timeout.component.html
index 5c005ad2a..e645f860a 100644
--- a/src/app/shared/alert/timeout/timeout.component.html
+++ b/src/app/shared/alert/timeout/timeout.component.html
@@ -2,16 +2,18 @@
- BlackListed Chars: {{ blacklistedChars.join(', ') }} -
- + @if (hasErrors) { + + Please remove the characters that are on the blacklist. +
+ BlackListed Chars: {{ blacklistedChars.join(', ') }} +
+ + }
Timeout
-
diff --git a/src/app/shared/breadcrumb/breadcrumb.component.html b/src/app/shared/breadcrumb/breadcrumb.component.html
index 7e8d55e29..3e17f4167 100644
--- a/src/app/shared/breadcrumb/breadcrumb.component.html
+++ b/src/app/shared/breadcrumb/breadcrumb.component.html
@@ -1,15 +1,23 @@
-
-
Logging out...
+
+
Logging out...
+ }
-
+
diff --git a/src/app/shared/grid-containers/grid-formgroup.ts b/src/app/shared/grid-containers/grid-formgroup.ts
index 0fd91984f..fb091edc4 100644
--- a/src/app/shared/grid-containers/grid-formgroup.ts
+++ b/src/app/shared/grid-containers/grid-formgroup.ts
@@ -1,43 +1,33 @@
-import { faInfoCircle } from '@fortawesome/free-solid-svg-icons';
-import { Component, Input } from '@angular/core';
-import { Router } from '@angular/router';
-import { FormGroup } from '@angular/forms';
+import { faInfoCircle } from '@fortawesome/free-solid-svg-icons'
+
+import { Component, Input } from '@angular/core'
@Component({
- selector: 'grid-form-input',
- template: `
-
-
-
-
+@for (c of breadcrumbs; track c) {
+
+}
diff --git a/src/app/shared/dialog/timeout/timeout-dialog.component.html b/src/app/shared/dialog/timeout/timeout-dialog.component.html
index 1b5573166..a1c6432de 100644
--- a/src/app/shared/dialog/timeout/timeout-dialog.component.html
+++ b/src/app/shared/dialog/timeout/timeout-dialog.component.html
@@ -5,5 +5,7 @@
+ @if (c.label?.length > 0) {
+
-
+
+ @for (breadcrumb of breadcrumbs; track breadcrumb; let last = $last) {
+
+
{{ breadcrumb.label }}
-
- {{ deliminator }}
-
+
+ @if (!last) {
+ {{ deliminator }}
+ }
+
+ }
+
+ }
{{ data.message }}
Logging out...
+ @if (data.timedOut) {
+ Logging out...
+ }
\ No newline at end of file
diff --git a/src/app/shared/dynamic-form-builder/dynamicform.component.html b/src/app/shared/dynamic-form-builder/dynamicform.component.html
index f53453b4a..9621ec2f0 100644
--- a/src/app/shared/dynamic-form-builder/dynamicform.component.html
+++ b/src/app/shared/dynamic-form-builder/dynamicform.component.html
@@ -2,129 +2,149 @@
+
diff --git a/src/app/shared/grid-containers/grid-formgroup.ts b/src/app/shared/grid-containers/grid-formgroup.ts
index 0fd91984f..fb091edc4 100644
--- a/src/app/shared/grid-containers/grid-formgroup.ts
+++ b/src/app/shared/grid-containers/grid-formgroup.ts
@@ -1,43 +1,33 @@
-import { faInfoCircle } from '@fortawesome/free-solid-svg-icons';
-import { Component, Input } from '@angular/core';
-import { Router } from '@angular/router';
-import { FormGroup } from '@angular/forms';
+import { faInfoCircle } from '@fortawesome/free-solid-svg-icons'
+
+import { Component, Input } from '@angular/core'
@Component({
- selector: 'grid-form-input',
- template: `
-{{ data.message }}
Logging out...
+ @if (data.timedOut) { +Logging out...
+ }
-
+ selector: 'grid-form-input',
+ template: `
+
-
-
-
-
+
`,
- standalone: false
+ standalone: false
})
export class GridFormInputComponent {
+ faInfoCircle = faInfoCircle
- faInfoCircle = faInfoCircle;
-
- @Input() name?: any;
- @Input() labelclass?: any;
- @Input() tooltip?: any;
-
- tooltio: any;
-
- constructor(
- private router: Router
- ) { }
-
+ @Input() name?: string
+ @Input() labelclass?: string
+ @Input() tooltip?: string
}
-
-
diff --git a/src/app/shared/grid-containers/simulate-form-field-multi/simulate-form-field-multi.component.html b/src/app/shared/grid-containers/simulate-form-field-multi/simulate-form-field-multi.component.html
index db5f2232c..64db7106e 100644
--- a/src/app/shared/grid-containers/simulate-form-field-multi/simulate-form-field-multi.component.html
+++ b/src/app/shared/grid-containers/simulate-form-field-multi/simulate-form-field-multi.component.html
@@ -4,13 +4,15 @@
+
+ @if (tooltip) {
+
+ }
+
+
-
+ }
-
-
-
- {{ icon }}
+ @if (icon) {
+ {{ icon }}
+ }
diff --git a/src/app/shared/hashtype-detector/hashtype-detector.component.html b/src/app/shared/hashtype-detector/hashtype-detector.component.html
index b79d47ec8..be2376ea6 100644
--- a/src/app/shared/hashtype-detector/hashtype-detector.component.html
+++ b/src/app/shared/hashtype-detector/hashtype-detector.component.html
@@ -15,22 +15,24 @@
-
- {{ label }}
-
+ @if (routerLink) {
+
+ {{ label }}
+
+ }
Hashtype Detector
-
-
+ @if (type && type !== false) {
+ Error. No hash type found.
-
+
+ }
diff --git a/src/app/shared/input/check/check.component.html b/src/app/shared/input/check/check.component.html
index 4188daf7d..65001a953 100644
--- a/src/app/shared/input/check/check.component.html
+++ b/src/app/shared/input/check/check.component.html
@@ -1,13 +1,14 @@
Error. No hash type found.
+Invalid date.
+ @if (error) {
+ Invalid date.
+ }
-
-
-
+ @if (isLoading) {
+
+} @else {
- {{ item.id }}
- {{ item.name?.length > 30 ? (item.name | slice:0:30) + '...' : item.name }}
-
-
-
+ {{ item.id }}
+ {{ item.name?.length > 30 ? (item.name | slice:0:30) + '...' : item.name }}
+
+
+
- ![]()
- ![]()
-
+ selector: 'app-loading-spinner',
+ template: `
+ @if (isLoading) {
+
-
-
-
-
-
-
-
-
+ ![]()
+ }
+ @if (currentTheme() === 'dark') {
+ ![]()
+ }
+
+ }
`,
- standalone: false
+ standalone: false
})
export class LoadingSpinnerComponent {
-
- headerConfig = environment.config.header;
- isLoading = true;
+ headerConfig = environment.config.header
+ isLoading = true
constructor(
private theme: ThemeService,
public ls: LoadingService
- ) {
- this.ls.showSpinner.subscribe(this.stateSpinner.bind(this));
- }
+ ) {
+ this.ls.showSpinner.subscribe(this.stateSpinner.bind(this))
+ }
public currentTheme(): string {
- return this.theme.current;
+ return this.theme.current
}
stateSpinner = (state: boolean): void => {
- this.isLoading = state;
- };
-
+ this.isLoading = state
+ }
}
-
-
diff --git a/src/app/shared/navigation/horizontalnav.component.html b/src/app/shared/navigation/horizontalnav.component.html
index c5511f933..3f9abacf8 100644
--- a/src/app/shared/navigation/horizontalnav.component.html
+++ b/src/app/shared/navigation/horizontalnav.component.html
@@ -3,7 +3,7 @@
+
+ @if (currentTheme() !== 'dark') {
+
+
+
+
+
+
+ {{ subtitle }}
-{{ title }}
--
-
- - « - + @if ((currentPage - range) > 1) { +
- + « + + }
- -
- - ... - -
- - {{ page }} - -
- - ... - + @if ((currentPage - range) > 1) { +
- + ... + + } + @for (page of pages; track page) { +
- + {{ page }} + + } + @if ((currentPage + range) < totalPages) { +
- + ... + + }
-
diff --git a/src/app/shared/password/pass-match/pass-match.component.ts b/src/app/shared/password/pass-match/pass-match.component.ts
index dec61ff05..29a60fd90 100644
--- a/src/app/shared/password/pass-match/pass-match.component.ts
+++ b/src/app/shared/password/pass-match/pass-match.component.ts
@@ -1,35 +1,29 @@
-import { Component, EventEmitter, Input, OnChanges, Output, SimpleChange, SimpleChanges } from '@angular/core';
+import { Component, Input, OnChanges, SimpleChange } from '@angular/core'
@Component({
- selector: 'app-pass-match',
- template: `
- --`, - standalone: false + selector: 'app-pass-match', + template: ` +
{{ message }}
-+ @if (confirmPassword?.length) { ++ `, + standalone: false }) export class PassMatchComponent implements OnChanges { + @Input() public newPassword: string + @Input() public confirmPassword: string - @Input() public newPassword: string; - @Input() public confirmPassword: string; - - message: string; + message: string ngOnChanges(changes: { [propName: string]: SimpleChange }): void { - - const confirmpass = changes['confirmPassword'].currentValue; + const confirmpass = changes['confirmPassword'].currentValue if (confirmpass) { - - this.message = (confirmpass === this.newPassword) ? 'Match' : 'No Match'; - - }else{ - - this.message = ''; - + this.message = confirmpass === this.newPassword ? 'Match' : 'No Match' + } else { + this.message = '' } - } - } diff --git a/src/app/shared/password/pass-strenght/pass-strenght.component.html b/src/app/shared/password/pass-strenght/pass-strenght.component.html index af5f3ef5d..577b9fbb8 100644 --- a/src/app/shared/password/pass-strenght/pass-strenght.component.html +++ b/src/app/shared/password/pass-strenght/pass-strenght.component.html @@ -1,10 +1,11 @@{{ message }}
+ } +@@ -37,24 +41,28 @@{{ strength.label }} diff --git a/src/app/shared/report-builder/reports/report-builder/report-builder.component.html b/src/app/shared/report-builder/reports/report-builder/report-builder.component.html index 63bfd401c..ea50bbea8 100644 --- a/src/app/shared/report-builder/reports/report-builder/report-builder.component.html +++ b/src/app/shared/report-builder/reports/report-builder/report-builder.component.html @@ -1,35 +1,39 @@ --- +@if (isLoaded) { +- - + + } diff --git a/src/app/shared/scrollytop/scrollytop.component.ts b/src/app/shared/scrollytop/scrollytop.component.ts index b1783d680..15f963b30 100644 --- a/src/app/shared/scrollytop/scrollytop.component.ts +++ b/src/app/shared/scrollytop/scrollytop.component.ts @@ -1,42 +1,39 @@ -import { Component, OnInit, Inject, HostListener } from '@angular/core'; -import { faChevronUp } from '@fortawesome/free-solid-svg-icons'; -import { DOCUMENT } from '@angular/common'; +import { faChevronUp } from '@fortawesome/free-solid-svg-icons' + +import { Component, DOCUMENT, HostListener, Inject } from '@angular/core' @Component({ - selector: 'app-scroll-top', - templateUrl: './scrollytop.component.html', - standalone: false + selector: 'app-scroll-top', + templateUrl: './scrollytop.component.html', + standalone: false }) - export class ScrollYTopComponent { - - windowScrolled: boolean; - faChevronUp=faChevronUp; - - constructor( - @Inject(DOCUMENT) private document: Document - ) {} - - @HostListener("window:scroll", []) - - onWindowScroll() { - if (window.scrollY || document.documentElement.scrollTop || document.body.scrollTop > 100) { - this.windowScrolled = true; - } - else if (this.windowScrolled && window.scrollY || document.documentElement.scrollTop || document.body.scrollTop < 10) { - this.windowScrolled = false; - } - } - - scrollToTop() { - (function smoothscroll() { - const currentScroll = document.documentElement.scrollTop || document.body.scrollTop; - if (currentScroll > 0) { - window.requestAnimationFrame(smoothscroll); - scrollBy(0, 5); - window.scrollTo(0, currentScroll - (currentScroll / 8)); - } - })(); + windowScrolled: boolean + faChevronUp = faChevronUp + + constructor(@Inject(DOCUMENT) private document: Document) {} + + @HostListener('window:scroll', []) + onWindowScroll() { + if (window.scrollY || document.documentElement.scrollTop || document.body.scrollTop > 100) { + this.windowScrolled = true + } else if ( + (this.windowScrolled && window.scrollY) || + document.documentElement.scrollTop || + document.body.scrollTop < 10 + ) { + this.windowScrolled = false } - + } + + scrollToTop() { + ;(function smoothscroll() { + const currentScroll = document.documentElement.scrollTop || document.body.scrollTop + if (currentScroll > 0) { + window.requestAnimationFrame(smoothscroll) + scrollBy(0, 5) + window.scrollTo(0, currentScroll - currentScroll / 8) + } + })() + } } diff --git a/src/app/shared/switch-theme/button/switch-theme.component.html b/src/app/shared/switch-theme/button/switch-theme.component.html index 7e3c60030..9e5f658ad 100644 --- a/src/app/shared/switch-theme/button/switch-theme.component.html +++ b/src/app/shared/switch-theme/button/switch-theme.component.html @@ -1,8 +1,12 @@ - - +@if (currentTheme() === 'dark') { + + Light Mode - - - + +} +@if (currentTheme() === 'light') { + + Dark Mode - + +} diff --git a/src/app/shared/widgets/last-updated/last-updated.component.html b/src/app/shared/widgets/last-updated/last-updated.component.html index e1c450d8f..494a2f1d5 100644 --- a/src/app/shared/widgets/last-updated/last-updated.component.html +++ b/src/app/shared/widgets/last-updated/last-updated.component.html @@ -1,13 +1,15 @@ - - Last updated: {{ lastUpdatedDisplay }} - - - +} diff --git a/src/app/shared/widgets/last-updated/last-updated.component.ts b/src/app/shared/widgets/last-updated/last-updated.component.ts index abee08220..3e6a22180 100644 --- a/src/app/shared/widgets/last-updated/last-updated.component.ts +++ b/src/app/shared/widgets/last-updated/last-updated.component.ts @@ -1,15 +1,14 @@ -import { Subscription, interval } from 'rxjs'; +import { Subscription, interval } from 'rxjs' -import { CommonModule } from '@angular/common'; -import { ChangeDetectorRef, Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core'; -import { MatProgressSpinner } from '@angular/material/progress-spinner'; +import { ChangeDetectorRef, Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core' +import { MatProgressSpinner } from '@angular/material/progress-spinner' -import { UIConfig } from '@models/config-ui.model'; +import { UIConfig } from '@models/config-ui.model' -import { LocalStorageService } from '@services/storage/local-storage.service'; +import { LocalStorageService } from '@services/storage/local-storage.service' -import { UISettingsUtilityClass } from '@src/app/shared/utils/config'; -import { formatDate } from '@src/app/shared/utils/datetime'; +import { UISettingsUtilityClass } from '@src/app/shared/utils/config' +import { formatDate } from '@src/app/shared/utils/datetime' /** * Component to display the last updated time and a countdown to the next refresh. @@ -35,7 +34,7 @@ import { formatDate } from '@src/app/shared/utils/datetime'; selector: 'last-updated', templateUrl: './last-updated.component.html', styleUrls: ['./last-updated.component.scss'], - imports: [CommonModule, MatProgressSpinner], + imports: [MatProgressSpinner], providers: [ { provide: UISettingsUtilityClass, @@ -46,19 +45,19 @@ import { formatDate } from '@src/app/shared/utils/datetime'; }) export class LastUpdatedComponent implements OnInit, OnDestroy, OnChanges { /** The actual last time data was loaded */ - @Input() lastUpdated!: Date; + @Input() lastUpdated!: Date /** Timestamp (ms) of the next scheduled refresh */ - @Input() nextRefreshTimestamp!: number; + @Input() nextRefreshTimestamp!: number /** Whether a refresh is currently in progress */ - @Input() refreshing = false; + @Input() refreshing = false /** Display string for countdown in mm:ss format */ - nextUpdateDisplay: string | null = null; + nextUpdateDisplay: string | null = null /** Subscription for interval timer */ - private timerSubscription?: Subscription; + private timerSubscription?: Subscription /** Injected utility for UI settings */ constructor( @@ -68,62 +67,62 @@ export class LastUpdatedComponent implements OnInit, OnDestroy, OnChanges { /** Returns the formatted last updated time according to UI settings */ get lastUpdatedDisplay(): string { - return formatDate(this.lastUpdated, this.util.getSetting('timefmt')); + return formatDate(this.lastUpdated, this.util.getSetting('timefmt')) } /** Initialize the countdown timer */ ngOnInit(): void { - this.startCountdown(); + this.startCountdown() } /** Handle changes to input properties */ ngOnChanges(changes: SimpleChanges): void { if (changes['nextRefreshTimestamp'] && changes['nextRefreshTimestamp'].currentValue) { - this.updateCountdown(); // recalc immediately - this.startCountdown(); // restart interval with the new timestamp + this.updateCountdown() // recalc immediately + this.startCountdown() // restart interval with the new timestamp } } /** Start or restart the countdown interval */ private startCountdown(): void { - this.timerSubscription?.unsubscribe(); - this.updateCountdown(); // ensure UI is correct on init + this.timerSubscription?.unsubscribe() + this.updateCountdown() // ensure UI is correct on init this.timerSubscription = interval(250).subscribe(() => { - this.updateCountdown(); + this.updateCountdown() // stop interval once countdown reaches 00:00 if (this.nextUpdateDisplay === '00:00') { - this.timerSubscription?.unsubscribe(); + this.timerSubscription?.unsubscribe() } - }); + }) } /** Update countdown display based on the next refresh timestamp */ private updateCountdown(): void { if (!this.nextRefreshTimestamp || this.refreshing) { - this.nextUpdateDisplay = null; - this.cd.detectChanges(); - return; + this.nextUpdateDisplay = null + this.cd.detectChanges() + return } - const diffMs = this.nextRefreshTimestamp - Date.now(); + const diffMs = this.nextRefreshTimestamp - Date.now() if (diffMs <= 0) { - this.nextUpdateDisplay = '00:00'; - this.cd.markForCheck(); - return; + this.nextUpdateDisplay = '00:00' + this.cd.markForCheck() + return } - const totalSec = Math.ceil(diffMs / 1000); // ceil keeps the last second visible - const minutes = Math.floor(totalSec / 60); - const seconds = totalSec % 60; + const totalSec = Math.ceil(diffMs / 1000) // ceil keeps the last second visible + const minutes = Math.floor(totalSec / 60) + const seconds = totalSec % 60 - this.nextUpdateDisplay = `${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`; - this.cd.detectChanges(); + this.nextUpdateDisplay = `${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}` + this.cd.detectChanges() } /** Clean up the interval subscription */ ngOnDestroy(): void { - this.timerSubscription?.unsubscribe(); + this.timerSubscription?.unsubscribe() } } diff --git a/src/app/shared/wordlist-generator/wordlist-generator.component.html b/src/app/shared/wordlist-generator/wordlist-generator.component.html index 70c8e6fdd..90baac0e6 100644 --- a/src/app/shared/wordlist-generator/wordlist-generator.component.html +++ b/src/app/shared/wordlist-generator/wordlist-generator.component.html @@ -11,24 +11,28 @@+ @if (reportForm) { + + } + {{ ui.dialogTitle }}
{{ ui.names.inputLabel }} 1 + matInput />help -+ @for (control of names.controls.slice(1); track control; let i = $index) { +- - -{{ ui.names.inputLabel }} {{ i + 2 }} - -++ }+ + @if (names.controls.length > 1) { + + } +{{ ui.names.inputLabel }} {{ i + 2 }} + +{{ ui.dialogTitle }}
{{ ui.sparetext.inputLabel }} 1 + matInput />help
-
- {{ ui.sparetext.inputLabel }} {{ i + 2 }}
-
-
-
-
+ @for (control of sparetext.controls.slice(1); track control; let i = $index) {
+
+
+ {{ ui.sparetext.inputLabel }} {{ i + 2 }}
+
+
+ @if (sparetext.controls.length > 1) {
+
+ }
+
+ }
@@ -62,7 +70,7 @@ {{ ui.dialogTitle }}
{{ ui.dialogTitle }}
-
- {{ ui.formError }}
-
+ @if (submitted && form.errors?.atLeastOneRequired) {
+
+ {{ ui.formError }}
+
+ }
{{ ui.dialogTitle }}
-
diff --git a/src/app/shared/wordlist-generator/wordlist-generator.component.spec.ts b/src/app/shared/wordlist-generator/wordlist-generator.component.spec.ts
index edf40ca0c..de72de9a8 100644
--- a/src/app/shared/wordlist-generator/wordlist-generator.component.spec.ts
+++ b/src/app/shared/wordlist-generator/wordlist-generator.component.spec.ts
@@ -1,5 +1,3 @@
-import * as Wordpolis from 'wordpolis';
-
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { FormArray, ReactiveFormsModule } from '@angular/forms';
import { MatCheckboxModule } from '@angular/material/checkbox';
@@ -17,6 +15,7 @@ import { AlertService } from '@services/shared/alert.service';
import { GridModule } from '@src/app/shared/grid-containers/grid.module';
import { WordlistGeneratorComponent } from '@src/app/shared/wordlist-generator/wordlist-generator.component';
+import { Wordpolis } from '@src/app/shared/wordlist-generator/wordpolis-wrapper';
// Mock AlertService
class MockAlertService {
diff --git a/src/app/shared/wordlist-generator/wordlist-generator.component.ts b/src/app/shared/wordlist-generator/wordlist-generator.component.ts
index 7f78718b6..2578824f6 100644
--- a/src/app/shared/wordlist-generator/wordlist-generator.component.ts
+++ b/src/app/shared/wordlist-generator/wordlist-generator.component.ts
@@ -1,15 +1,14 @@
-import { generateCandidates } from 'wordpolis';
+import { ChangeDetectorRef, Component, OnInit } from '@angular/core'
+import { AbstractControl, FormArray, FormControl } from '@angular/forms'
-import { ChangeDetectorRef, Component, OnInit } from '@angular/core';
-import { AbstractControl, FormArray, FormControl } from '@angular/forms';
-
-import { AlertService } from '@services/shared/alert.service';
+import { AlertService } from '@services/shared/alert.service'
import {
GenerateWordListForm,
GenerateWordListFormGroup
-} from '@src/app/shared/wordlist-generator/wordlist-generator.form';
-import { ui } from '@src/app/shared/wordlist-generator/wordlist-generator.ui';
+} from '@src/app/shared/wordlist-generator/wordlist-generator.form'
+import { ui } from '@src/app/shared/wordlist-generator/wordlist-generator.ui'
+import { Wordpolis } from '@src/app/shared/wordlist-generator/wordpolis-wrapper'
/**
* Component for generating a wordlist based on user-provided parameters.
@@ -23,13 +22,13 @@ import { ui } from '@src/app/shared/wordlist-generator/wordlist-generator.ui';
})
export class WordlistGeneratorComponent implements OnInit {
/** Reactive form group for wordlist generation. */
- form: GenerateWordListFormGroup;
+ form: GenerateWordListFormGroup
/** Indicates if the form was submitted. Used for validation feedback. */
- submitted = false;
+ submitted = false
/** UI text and configuration imported const in seperated ts file. */
- ui = ui;
+ ui = ui
/**
* Constructor.
@@ -46,14 +45,14 @@ export class WordlistGeneratorComponent implements OnInit {
* Initializes the form on component load.
*/
ngOnInit(): void {
- this.buildForm();
+ this.buildForm()
}
/**
* Builds and initializes the wordlist form.
*/
buildForm(): void {
- this.form = new GenerateWordListFormGroup();
+ this.form = new GenerateWordListFormGroup()
}
/**
@@ -61,7 +60,7 @@ export class WordlistGeneratorComponent implements OnInit {
* @returns {FormArray} The FormArray containing name controls.
*/
get names(): FormArray {
- return this.form.get('names') as FormArray;
+ return this.form.get('names') as FormArray
}
/**
@@ -69,7 +68,7 @@ export class WordlistGeneratorComponent implements OnInit {
* @returns {FormArray} The FormArray containing attribute controls.
*/
get sparetext(): FormArray {
- return this.form.get('sparetext') as FormArray;
+ return this.form.get('sparetext') as FormArray
}
/**
@@ -77,8 +76,8 @@ export class WordlistGeneratorComponent implements OnInit {
* @param controlName Name of the FormArray control.
*/
addControl(controlName: keyof GenerateWordListForm) {
- this.form.addControlToArray(controlName);
- this.cdr.detectChanges();
+ this.form.addControlToArray(controlName)
+ this.cdr.detectChanges()
}
/**
@@ -87,8 +86,8 @@ export class WordlistGeneratorComponent implements OnInit {
* @param index
*/
removeItem(controlName: keyof GenerateWordListForm, index: number) {
- this.form.removeControlFromArray(controlName, index);
- this.cdr.detectChanges();
+ this.form.removeControlFromArray(controlName, index)
+ this.cdr.detectChanges()
}
/**
@@ -97,7 +96,7 @@ export class WordlistGeneratorComponent implements OnInit {
* @returns {FormControl} The cast FormControl.
*/
getFormControl(control: AbstractControl): FormControl {
- return control as FormControl;
+ return control as FormControl
}
/**
@@ -106,9 +105,9 @@ export class WordlistGeneratorComponent implements OnInit {
* Displays errors via the alert service if generation fails.
*/
onSubmit(): void {
- this.submitted = true;
+ this.submitted = true
if (this.form.valid) {
- const formData = this.form.value;
+ const formData = this.form.value
const {
names,
@@ -124,7 +123,7 @@ export class WordlistGeneratorComponent implements OnInit {
isSimilarConsonant,
isSimilarSpecialChars,
filename
- } = formData;
+ } = formData
const options = {
useSpecialchars: useSpecCharacters,
@@ -137,15 +136,15 @@ export class WordlistGeneratorComponent implements OnInit {
isSimilarConsonant: isSimilarConsonant,
isSimilarSpecialchars: isSimilarSpecialChars,
filename: filename
- };
+ }
try {
- generateCandidates(names, specialdates, sparetext, options);
+ Wordpolis.generateCandidates(names, specialdates, sparetext, options)
} catch (error) {
- console.error(ui.submitError, error);
- this.alert.showErrorMessage(ui.submitError);
+ console.error(ui.submitError, error)
+ this.alert.showErrorMessage(ui.submitError)
} finally {
- this.submitted = false;
+ this.submitted = false
}
}
}
diff --git a/src/app/shared/wordlist-generator/wordpolis-wrapper.ts b/src/app/shared/wordlist-generator/wordpolis-wrapper.ts
new file mode 100644
index 000000000..36260b234
--- /dev/null
+++ b/src/app/shared/wordlist-generator/wordpolis-wrapper.ts
@@ -0,0 +1,27 @@
+// wordpolis-wrapper.ts
+import * as WordpolisOriginal from 'wordpolis'
+
+/**
+ * Wrapper for the Wordpolis module.
+ *
+ * This wrapper object is required because ES module exports in Angular (and modern
+ * TypeScript/JavaScript) are immutable by default. Directly importing and spying
+ * on functions exported from an ES module (like `generateCandidates`) is not allowed,
+ * which causes errors in Jasmine tests such as:
+ *
+ * "Error:
- {{ checkbox.label }}
-
+ @for (checkbox of ui.additionalOptions.checkboxes; track checkbox) {
+
+ {{ checkbox.label }}
+
+ }