NIFI-14319: address naming and formatting feedback

Author: sardell

nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/expolorer/feature/ui/delete-droplet-dialog/delete-droplet-dialog.component.ts

@@ -24,7 +24,7 @@ import { deleteDroplet } from 'apps/nifi-registry/src/app/state/droplets/droplet
 import { Droplets } from 'apps/nifi-registry/src/app/state/droplets';
 import { MatButtonModule } from '@angular/material/button';
 
-interface Data {
+interface DeleteDropletDialogData {
     droplet: Droplets;
 }
 
@@ -39,7 +39,7 @@ export class DeleteDropletDialogComponent extends CloseOnEscapeDialog {
     droplet: Droplets;
 
     constructor(
-        @Inject(MAT_DIALOG_DATA) public data: Data,
+        @Inject(MAT_DIALOG_DATA) public data: DeleteDropletDialogData,
         private store: Store
     ) {
         super();

nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/expolorer/feature/ui/droplet-table-filter/droplet-table-filter.component.ts

@@ -53,8 +53,6 @@ export class DropletTableFilterComponent implements AfterViewInit {
     private _initialFilterColumn = 'name';
     private _filterableColumns: DropletTableFilterColumn[] = [];
     private _buckets: Bucket[] = [];
-    private _filteredCount = 0;
-    private _totalCount = 0;
     private destroyRef: DestroyRef = inject(DestroyRef);
 
     set filterableColumns(filterableColumns: DropletTableFilterColumn[]) {
@@ -92,21 +90,8 @@ export class DropletTableFilterComponent implements AfterViewInit {
         this.filterForm.controls['filterBucket']?.setValue(term);
     }
 
-    @Input() set filteredCount(filteredCount: number) {
-        this._filteredCount = filteredCount;
-    }
-
-    get filteredCount(): number {
-        return this._filteredCount;
-    }
-
-    @Input() set totalCount(totalCount: number) {
-        this._totalCount = totalCount;
-    }
-
-    get totalCount(): number {
-        return this._totalCount;
-    }
+    @Input() totalCount = 0;
+    @Input() filteredCount = 0;
 
     @Output() filterChanged: EventEmitter<DropletTableFilterContext> = new EventEmitter<DropletTableFilterContext>();
 

nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/expolorer/feature/ui/export-flow-version-dialog/export-flow-version-dialog.component.ts

@@ -27,7 +27,7 @@ import { exportFlowVersion } from 'apps/nifi-registry/src/app/state/droplets/dro
 import { CloseOnEscapeDialog } from '@nifi/shared';
 import { MatButtonModule } from '@angular/material/button';
 
-interface Data {
+export interface ExportFlowVersionDialogData {
     droplet: Droplets;
 }
 
@@ -43,7 +43,7 @@ export class ExportFlowVersionDialogComponent extends CloseOnEscapeDialog {
     selectedVersion: number;
 
     constructor(
-        @Inject(MAT_DIALOG_DATA) public data: Data,
+        @Inject(MAT_DIALOG_DATA) public data: ExportFlowVersionDialogData,
         private store: Store
     ) {
         super();

nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/expolorer/feature/ui/import-new-flow-dialog/import-new-flow-dialog.component.ts

@@ -28,8 +28,8 @@ import { Store } from '@ngrx/store';
 import { createNewFlow } from 'apps/nifi-registry/src/app/state/droplets/droplets.actions';
 import { MatButtonModule } from '@angular/material/button';
 
-interface Data {
-    activeBucket: any;
+export interface ImportNewFlowDialogData {
+    activeBucket?: any;
     buckets: any;
 }
 
@@ -64,7 +64,7 @@ export class ImportNewFlowDialogComponent extends CloseOnEscapeDialog implements
     description = '';
 
     constructor(
-        @Inject(MAT_DIALOG_DATA) public data: Data,
+        @Inject(MAT_DIALOG_DATA) public data: ImportNewFlowDialogData,
         private store: Store
     ) {
         super();

nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/expolorer/feature/ui/import-new-flow-version-dialog/import-new-flow-version-dialog.component.ts

@@ -27,8 +27,10 @@ import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatSelectModule } from '@angular/material/select';
 import { MatInputModule } from '@angular/material/input';
 import { MatButtonModule } from '@angular/material/button';
+import { Bucket } from 'apps/nifi-registry/src/app/state/buckets';
 
-interface Data {
+export interface ImportNewFlowVersionDialogData {
+    activeBucket?: Bucket;
     droplet: Droplets;
 }
 
@@ -66,7 +68,7 @@ export class ImportNewFlowVersionDialogComponent extends CloseOnEscapeDialog {
     comments = '';
 
     constructor(
-        @Inject(MAT_DIALOG_DATA) public data: Data,
+        @Inject(MAT_DIALOG_DATA) public data: ImportNewFlowVersionDialogData,
         private formBuilder: FormBuilder,
         private store: Store
     ) {

nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/state/droplets/droplets.effects.ts

@@ -28,8 +28,15 @@ import { DropletsService } from '../../service/droplets.service';
 import * as DropletsActions from './droplets.actions';
 import { DeleteDropletDialogComponent } from '../../pages/expolorer/feature/ui/delete-droplet-dialog/delete-droplet-dialog.component';
 import { ImportNewFlowDialogComponent } from '../../pages/expolorer/feature/ui/import-new-flow-dialog/import-new-flow-dialog.component';
-import { ImportNewFlowVersionDialogComponent } from '../../pages/expolorer/feature/ui/import-new-flow-version-dialog/import-new-flow-version-dialog.component';
-import { ExportFlowVersionDialogComponent } from '../../pages/expolorer/feature/ui/export-flow-version-dialog/export-flow-version-dialog.component';
+import { ImportNewFlowDialogData } from '../../pages/expolorer/feature/ui/import-new-flow-dialog/import-new-flow-dialog.component';
+import {
+    ImportNewFlowVersionDialogComponent,
+    ImportNewFlowVersionDialogData
+} from '../../pages/expolorer/feature/ui/import-new-flow-version-dialog/import-new-flow-version-dialog.component';
+import {
+    ExportFlowVersionDialogComponent,
+    ExportFlowVersionDialogData
+} from '../../pages/expolorer/feature/ui/export-flow-version-dialog/export-flow-version-dialog.component';
 import { FlowVersionsDialogComponent } from '../../pages/expolorer/feature/ui/flow-versions-dialog/flow-versions-dialog.component';
 import { ErrorHelper } from '../../service/error-helper.service';
 import * as ErrorActions from '../../state/error/error.actions';
@@ -74,11 +81,14 @@ export class DropletsEffects {
             this.actions$.pipe(
                 ofType(DropletsActions.openDeleteDropletDialog),
                 tap(({ request }) => {
-                    this.dialog.open(DeleteDropletDialogComponent, {
-                        ...SMALL_DIALOG,
-                        autoFocus: false,
-                        data: request
-                    });
+                    this.dialog.open<DeleteDropletDialogComponent, ExportFlowVersionDialogData>(
+                        DeleteDropletDialogComponent,
+                        {
+                            ...SMALL_DIALOG,
+                            autoFocus: false,
+                            data: request
+                        }
+                    );
                 })
             ),
         { dispatch: false }
@@ -112,14 +122,17 @@ export class DropletsEffects {
                 ofType(DropletsActions.openImportNewFlowDialog),
                 map((action) => action.request),
                 tap((request) => {
-                    this.dialog.open(ImportNewFlowDialogComponent, {
-                        ...MEDIUM_DIALOG,
-                        autoFocus: false,
-                        data: {
-                            activeBucket: request.activeBucket,
-                            buckets: request.buckets
+                    this.dialog.open<ImportNewFlowDialogComponent, ImportNewFlowDialogData>(
+                        ImportNewFlowDialogComponent,
+                        {
+                            ...MEDIUM_DIALOG,
+                            autoFocus: false,
+                            data: {
+                                activeBucket: request.activeBucket,
+                                buckets: request.buckets
+                            }
                         }
-                    });
+                    );
                 })
             ),
         { dispatch: false }
@@ -164,7 +177,7 @@ export class DropletsEffects {
 
     importNewFlowSuccess$ = createEffect(() =>
         this.actions$.pipe(
-            ofType(DropletsActions.deleteDropletSuccess),
+            ofType(DropletsActions.importNewFlowSuccess),
             switchMap(() => of(DropletsActions.loadDroplets()))
         )
     );
@@ -175,13 +188,16 @@ export class DropletsEffects {
                 ofType(DropletsActions.openImportNewFlowVersionDialog),
                 map((action) => action.request),
                 tap((request) => {
-                    this.dialog.open(ImportNewFlowVersionDialogComponent, {
-                        ...MEDIUM_DIALOG,
-                        autoFocus: false,
-                        data: {
-                            droplet: request.droplet
+                    this.dialog.open<ImportNewFlowVersionDialogComponent, ImportNewFlowVersionDialogData>(
+                        ImportNewFlowVersionDialogComponent,
+                        {
+                            ...MEDIUM_DIALOG,
+                            autoFocus: false,
+                            data: {
+                                droplet: request.droplet
+                            }
                         }
-                    });
+                    );
                 })
             ),
         { dispatch: false }
@@ -193,13 +209,16 @@ export class DropletsEffects {
                 ofType(DropletsActions.openExportFlowVersionDialog),
                 map((action) => action.request),
                 tap((request) => {
-                    this.dialog.open(ExportFlowVersionDialogComponent, {
-                        ...MEDIUM_DIALOG,
-                        autoFocus: false,
-                        data: {
-                            droplet: request.droplet
+                    this.dialog.open<ExportFlowVersionDialogComponent, ExportFlowVersionDialogData>(
+                        ExportFlowVersionDialogComponent,
+                        {
+                            ...MEDIUM_DIALOG,
+                            autoFocus: false,
+                            data: {
+                                droplet: request.droplet
+                            }
                         }
-                    });
+                    );
                 })
             ),
         { dispatch: false }
@@ -243,10 +262,7 @@ export class DropletsEffects {
     exportFlowVersionSuccess$ = createEffect(() =>
         this.actions$.pipe(
             ofType(DropletsActions.exportFlowVersionSuccess),
-            map((action) => action.response),
-            map(({ response }) => {
-                return response;
-            })
+            switchMap(() => of(DropletsActions.loadDroplets()))
         )
     );
 

nifi-frontend/src/main/frontend/apps/nifi-registry/src/styles.scss

@@ -39,12 +39,12 @@
 
  html {
     @include app.generate-material-theme();
-     @include app-component.generate-theme();
-     @include header.generate-theme();
+    @include app-component.generate-theme();
+    @include header.generate-theme();
 
      .dark-theme {
-         @include app.generate-material-theme();
-         @include app-component.generate-theme();
-         @include header.generate-theme();
+        @include app.generate-material-theme();
+        @include app-component.generate-theme();
+        @include header.generate-theme();
      }
  }