Merge pull request #347 from cobbler/feature/deduplicate-tohtml

Utils: Introduce static class with toHTML method
cobbler · Nov 1, 2024 · ff84e5f · ff84e5f
2 parents e7afcdc + 5b60175
commit ff84e5f
Show file tree

Hide file tree

Showing 31 changed files with 116 additions and 260 deletions.
diff --git a/projects/cobbler-frontend/src/app/actions/build-iso/build-iso.component.ts b/projects/cobbler-frontend/src/app/actions/build-iso/build-iso.component.ts
@@ -10,6 +10,7 @@ import { BackgroundBuildisoOptions, CobblerApiService } from 'cobbler-api';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { UserService } from '../../services/user.service';
+import Utils from '../../utils';
 
 @Component({
   selector: 'cobbler-build-iso',
@@ -85,14 +86,8 @@ export class BuildISOComponent implements OnDestroy {
         },
         (error) => {
           // HTML encode the error message since it originates from XML
-          this._snackBar.open(this.toHTML(error.message), 'Close');
+          this._snackBar.open(Utils.toHTML(error.message), 'Close');
         },
       );
   }
-
-  toHTML(input: string): any {
-    // FIXME: Deduplicate method
-    return new DOMParser().parseFromString(input, 'text/html').documentElement
-      .textContent;
-  }
 }
diff --git a/projects/cobbler-frontend/src/app/actions/check-sys/check-sys.component.ts b/projects/cobbler-frontend/src/app/actions/check-sys/check-sys.component.ts
@@ -11,6 +11,7 @@ import { CobblerApiService } from 'cobbler-api';
 import { Observable, of, Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { UserService } from '../../services/user.service';
+import Utils from '../../utils';
 
 @Component({
   selector: 'cobbler-check-sys',
@@ -63,15 +64,9 @@ export class CheckSysComponent implements OnInit, OnDestroy {
         },
         (error) => {
           // HTML encode the error message since it originates from XML
-          this._snackBar.open(this.toHTML(error.message), 'Close');
+          this._snackBar.open(Utils.toHTML(error.message), 'Close');
           this.isLoading = false;
         },
       );
   }
-
-  toHTML(input: string): any {
-    // FIXME: Deduplicate method
-    return new DOMParser().parseFromString(input, 'text/html').documentElement
-      .textContent;
-  }
 }
diff --git a/projects/cobbler-frontend/src/app/actions/hardlink/hardlink.component.ts b/projects/cobbler-frontend/src/app/actions/hardlink/hardlink.component.ts
@@ -5,6 +5,7 @@ import { CobblerApiService } from 'cobbler-api';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { UserService } from '../../services/user.service';
+import Utils from '../../utils';
 
 @Component({
   selector: 'cobbler-hardlink',
@@ -38,14 +39,8 @@ export class HardlinkComponent implements OnDestroy {
         },
         (error) => {
           // HTML encode the error message since it originates from XML
-          this._snackBar.open(this.toHTML(error.message), 'Close');
+          this._snackBar.open(Utils.toHTML(error.message), 'Close');
         },
       );
   }
-
-  toHTML(input: string): any {
-    // FIXME: Deduplicate method
-    return new DOMParser().parseFromString(input, 'text/html').documentElement
-      .textContent;
-  }
 }
diff --git a/projects/cobbler-frontend/src/app/actions/import-dvd/import-dvd.component.ts b/projects/cobbler-frontend/src/app/actions/import-dvd/import-dvd.component.ts
@@ -8,6 +8,7 @@ import { CobblerApiService, BackgroundImportOptions } from 'cobbler-api';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { UserService } from '../../services/user.service';
+import Utils from '../../utils';
 
 @Component({
   selector: 'cobbler-import-dvd',
@@ -77,14 +78,8 @@ export class ImportDVDComponent implements OnDestroy {
         },
         (error) => {
           // HTML encode the error message since it originates from XML
-          this._snackBar.open(this.toHTML(error.message), 'Close');
+          this._snackBar.open(Utils.toHTML(error.message), 'Close');
         },
       );
   }
-
-  toHTML(input: string): any {
-    // FIXME: Deduplicate method
-    return new DOMParser().parseFromString(input, 'text/html').documentElement
-      .textContent;
-  }
 }
diff --git a/projects/cobbler-frontend/src/app/actions/mkloaders/mkloaders.component.ts b/projects/cobbler-frontend/src/app/actions/mkloaders/mkloaders.component.ts
@@ -5,6 +5,7 @@ import { CobblerApiService } from 'cobbler-api';
 import { Subject, Subscription } from 'rxjs';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { MatButton } from '@angular/material/button';
+import Utils from '../../utils';
 
 @Component({
   selector: 'cobbler-mkloaders',
@@ -38,14 +39,8 @@ export class MkloadersComponent implements OnDestroy {
         },
         error: (error) => {
           // HTML encode the error message since it originates from XML
-          this._snackBar.open(this.toHTML(error.message), 'Close');
+          this._snackBar.open(Utils.toHTML(error.message), 'Close');
         },
       });
   }
-
-  toHTML(input: string): any {
-    // FIXME: Deduplicate method
-    return new DOMParser().parseFromString(input, 'text/html').documentElement
-      .textContent;
-  }
 }
diff --git a/projects/cobbler-frontend/src/app/actions/replicate/replicate.component.ts b/projects/cobbler-frontend/src/app/actions/replicate/replicate.component.ts
@@ -9,6 +9,7 @@ import { BackgroundReplicateOptions, CobblerApiService } from 'cobbler-api';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { UserService } from '../../services/user.service';
+import Utils from '../../utils';
 
 @Component({
   selector: 'cobbler-replicate',
@@ -86,14 +87,8 @@ export class ReplicateComponent implements OnDestroy {
         },
         (error) => {
           // HTML encode the error message since it originates from XML
-          this._snackBar.open(this.toHTML(error.message), 'Close');
+          this._snackBar.open(Utils.toHTML(error.message), 'Close');
         },
       );
   }
-
-  toHTML(input: string): any {
-    // FIXME: Deduplicate method
-    return new DOMParser().parseFromString(input, 'text/html').documentElement
-      .textContent;
-  }
 }
diff --git a/projects/cobbler-frontend/src/app/actions/repo-sync/repo-sync.component.ts b/projects/cobbler-frontend/src/app/actions/repo-sync/repo-sync.component.ts
@@ -27,6 +27,7 @@ import {
 } from '@angular/material/form-field';
 import { MatIcon } from '@angular/material/icon';
 import { MatInput, MatInputModule } from '@angular/material/input';
+import Utils from '../../utils';
 
 @Component({
   selector: 'cobbler-repo-sync',
@@ -116,14 +117,8 @@ export class RepoSyncComponent implements OnDestroy {
         },
         (error) => {
           // HTML encode the error message since it originates from XML
-          this._snackBar.open(this.toHTML(error.message), 'Close');
+          this._snackBar.open(Utils.toHTML(error.message), 'Close');
         },
       );
   }
-
-  toHTML(input: string): any {
-    // FIXME: Deduplicate method
-    return new DOMParser().parseFromString(input, 'text/html').documentElement
-      .textContent;
-  }
 }
diff --git a/projects/cobbler-frontend/src/app/actions/sync/sync.component.ts b/projects/cobbler-frontend/src/app/actions/sync/sync.component.ts
@@ -29,6 +29,7 @@ import { CobblerApiService } from 'cobbler-api';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { UserService } from '../../services/user.service';
+import Utils from '../../utils';
 
 @Component({
   selector: 'cobbler-sync',
@@ -117,7 +118,7 @@ export class SyncComponent implements OnDestroy {
         },
         (error) => {
           // HTML encode the error message since it originates from XML
-          this._snackBar.open(this.toHTML(error.message), 'Close');
+          this._snackBar.open(Utils.toHTML(error.message), 'Close');
         },
       );
   }
@@ -154,14 +155,8 @@ export class SyncComponent implements OnDestroy {
         },
         (error) => {
           // HTML encode the error message since it originates from XML
-          this._snackBar.open(this.toHTML(error.message), 'Close');
+          this._snackBar.open(Utils.toHTML(error.message), 'Close');
         },
       );
   }
-
-  toHTML(input: string): any {
-    // FIXME: Deduplicate method
-    return new DOMParser().parseFromString(input, 'text/html').documentElement
-      .textContent;
-  }
 }
diff --git a/...cobbler-frontend/src/app/actions/validate-autoinstalls/validate-autoinstalls.component.ts b/...cobbler-frontend/src/app/actions/validate-autoinstalls/validate-autoinstalls.component.ts
@@ -5,6 +5,7 @@ import { CobblerApiService } from 'cobbler-api';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { UserService } from '../../services/user.service';
+import Utils from '../../utils';
 
 @Component({
   selector: 'cobbler-validate-autoinstalls',
@@ -38,14 +39,8 @@ export class ValidateAutoinstallsComponent implements OnDestroy {
         },
         (error) => {
           // HTML encode the error message since it originates from XML
-          this._snackBar.open(this.toHTML(error.message), 'Close');
+          this._snackBar.open(Utils.toHTML(error.message), 'Close');
         },
       );
   }
-
-  toHTML(input: string): any {
-    // FIXME: Deduplicate method
-    return new DOMParser().parseFromString(input, 'text/html').documentElement
-      .textContent;
-  }
 }
diff --git a/projects/cobbler-frontend/src/app/items/distro/edit/distro-edit.component.ts b/projects/cobbler-frontend/src/app/items/distro/edit/distro-edit.component.ts
@@ -18,6 +18,7 @@ import { CobblerApiService, Distro } from 'cobbler-api';
 import { KeyValueEditorComponent } from '../../../common/key-value-editor/key-value-editor.component';
 import { MultiSelectComponent } from '../../../common/multi-select/multi-select.component';
 import { UserService } from '../../../services/user.service';
+import Utils from '../../../utils';
 
 @Component({
   selector: 'cobbler-edit',
@@ -229,7 +230,7 @@ export class DistroEditComponent implements OnInit {
         },
         (error) => {
           // HTML encode the error message since it originates from XML
-          this._snackBar.open(this.toHTML(error.message), 'Close');
+          this._snackBar.open(Utils.toHTML(error.message), 'Close');
         },
       );
   }
@@ -250,7 +251,7 @@ export class DistroEditComponent implements OnInit {
         },
         (error) => {
           // HTML encode the error message since it originates from XML
-          this._snackBar.open(this.toHTML(error.message), 'Close');
+          this._snackBar.open(Utils.toHTML(error.message), 'Close');
         },
       );
   }
@@ -269,7 +270,7 @@ export class DistroEditComponent implements OnInit {
         },
         (error) => {
           // HTML encode the error message since it originates from XML
-          this._snackBar.open(this.toHTML(error.message), 'Close');
+          this._snackBar.open(Utils.toHTML(error.message), 'Close');
         },
       );
   }
@@ -347,10 +348,4 @@ export class DistroEditComponent implements OnInit {
     }
     return {};
   }
-
-  toHTML(input: string): any {
-    // FIXME: Deduplicate method
-    return new DOMParser().parseFromString(input, 'text/html').documentElement
-      .textContent;
-  }
 }
diff --git a/projects/cobbler-frontend/src/app/items/distro/overview/distros-overview.component.ts b/projects/cobbler-frontend/src/app/items/distro/overview/distros-overview.component.ts
@@ -23,6 +23,7 @@ import { takeUntil } from 'rxjs/operators';
 import { DialogBoxTextConfirmComponent } from '../../../common/dialog-box-text-confirm/dialog-box-text-confirm';
 import { DialogItemRenameComponent } from '../../../common/dialog-item-rename/dialog-item-rename.component';
 import { UserService } from '../../../services/user.service';
+import Utils from '../../../utils';
 
 @Component({
   selector: 'cobbler-distros',
@@ -86,7 +87,7 @@ export class DistrosOverviewComponent implements OnInit, OnDestroy {
         },
         (error) => {
           // HTML encode the error message since it originates from XML
-          this._snackBar.open(this.toHTML(error.message), 'Close');
+          this._snackBar.open(Utils.toHTML(error.message), 'Close');
         },
       );
   }
@@ -123,13 +124,13 @@ export class DistrosOverviewComponent implements OnInit, OnDestroy {
                 },
                 (error) => {
                   // HTML encode the error message since it originates from XML
-                  this._snackBar.open(this.toHTML(error.message), 'Close');
+                  this._snackBar.open(Utils.toHTML(error.message), 'Close');
                 },
               );
           },
           (error) => {
             // HTML encode the error message since it originates from XML
-            this._snackBar.open(this.toHTML(error.message), 'Close');
+            this._snackBar.open(Utils.toHTML(error.message), 'Close');
           },
         );
     });
@@ -145,14 +146,8 @@ export class DistrosOverviewComponent implements OnInit, OnDestroy {
         },
         (error) => {
           // HTML encode the error message since it originates from XML
-          this._snackBar.open(this.toHTML(error.message), 'Close');
+          this._snackBar.open(Utils.toHTML(error.message), 'Close');
         },
       );
   }
-
-  toHTML(input: string): any {
-    // FIXME: Deduplicate method
-    return new DOMParser().parseFromString(input, 'text/html').documentElement
-      .textContent;
-  }
 }
diff --git a/projects/cobbler-frontend/src/app/items/file/edit/file-edit.component.ts b/projects/cobbler-frontend/src/app/items/file/edit/file-edit.component.ts
@@ -17,6 +17,7 @@ import { MatTooltip } from '@angular/material/tooltip';
 import { ActivatedRoute, Router } from '@angular/router';
 import { CobblerApiService, File } from 'cobbler-api';
 import { UserService } from '../../../services/user.service';
+import Utils from '../../../utils';
 
 @Component({
   selector: 'cobbler-edit',
@@ -103,7 +104,7 @@ export class FileEditComponent implements OnInit {
         },
         (error) => {
           // HTML encode the error message since it originates from XML
-          this._snackBar.open(this.toHTML(error.message), 'Close');
+          this._snackBar.open(Utils.toHTML(error.message), 'Close');
         },
       );
   }
@@ -124,7 +125,7 @@ export class FileEditComponent implements OnInit {
         },
         (error) => {
           // HTML encode the error message since it originates from XML
-          this._snackBar.open(this.toHTML(error.message), 'Close');
+          this._snackBar.open(Utils.toHTML(error.message), 'Close');
         },
       );
   }
@@ -141,18 +142,12 @@ export class FileEditComponent implements OnInit {
       },
       (error) => {
         // HTML encode the error message since it originates from XML
-        this._snackBar.open(this.toHTML(error.message), 'Close');
+        this._snackBar.open(Utils.toHTML(error.message), 'Close');
       },
     );
   }
 
   saveFile(): void {
     // TODO
   }
-
-  toHTML(input: string): any {
-    // FIXME: Deduplicate method
-    return new DOMParser().parseFromString(input, 'text/html').documentElement
-      .textContent;
-  }
 }