NIFI-14319: remove error abstractions from shared folder

Author: sardell

nifi-frontend/src/main/frontend/apps/nifi-registry/project.json

@@ -14,7 +14,7 @@
             "executor": "@nx/angular:application",
             "outputs": ["{options.outputPath}"],
             "options": {
-                "outputPath": "dist/apps/nifi-registry",
+                "outputPath": "dist/nifi-registry",
                 "index": "apps/nifi-registry/src/index.html",
                 "browser": "apps/nifi-registry/src/main.ts",
                 "polyfills": ["zone.js"],
@@ -60,7 +60,7 @@
                     "outputHashing": "none",
                     "assets": [
                         {
-                            "glob": "**/*",
+                            "glob": "**/*.svg",
                             "input": "libs/shared/src/assets/",
                             "output": "./assets"
                         }
@@ -91,7 +91,8 @@
                 "proxyConfig": "apps/nifi-registry/proxy.config.mjs",
                 "buildTarget": "nifi-registry:build",
                 "port": 4204
-            }
+            },
+            "continuous": true
         },
         "extract-i18n": {
             "executor": "@angular-devkit/build-angular:extract-i18n",
@@ -128,14 +129,6 @@
             "options": {
                 "jestConfig": "apps/nifi-registry/jest.config.ts"
             }
-        },
-        "serve-static": {
-            "executor": "@nx/web:file-server",
-            "options": {
-                "buildTarget": "nifi-registry:build",
-                "staticFilePath": "dist/apps/nifi-registry/browser",
-                "spa": true
-            }
         }
     }
 }

nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/app-routing.module.ts

@@ -17,37 +17,20 @@
 
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { ResourcesComponent } from './pages/resources/feature/resources.component';
-import { Error } from './pages/error/feature/error.component';
 
 const routes: Routes = [
-    {
-        path: 'error',
-        loadComponent: () => Error
-    },
-    {
-        path: 'resources',
-        component: ResourcesComponent,
-        children: [
-            {
-                path: ':id',
-                component: ResourcesComponent
-            }
-        ]
-    },
-    {
-        path: 'nifi-registry',
-        redirectTo: 'resources'
-    },
     {
         path: '',
         redirectTo: 'resources',
         pathMatch: 'full'
     },
     {
-        path: '',
-        loadComponent: () => import('./pages/resources/feature/resources.component').then((m) => m.ResourcesComponent)
+        path: 'resources',
+        loadChildren: () => import('./pages/resources/feature/resources.module').then((m) => m.ResourcesModule)
     }
+    // TODO: buckets
+    // TODO: Users/groups
+    // TODO: Page not found
 ];
 
 @NgModule({

nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/app.component.html

@@ -16,6 +16,8 @@
   -->
 
 <div class="flex flex-col h-screen">
-    <app-header></app-header>
+    <header class="mb-5 nifi-registry-header">
+        <app-header></app-header>
+    </header>
     <router-outlet></router-outlet>
 </div>

nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/app.module.ts

@@ -25,16 +25,15 @@ import {
     provideNoopAnimations
 } from '@angular/platform-browser/animations';
 import { StoreModule } from '@ngrx/store';
+import { StoreDevtoolsModule } from '@ngrx/store-devtools';
 import { provideHttpClient, withInterceptors, withXsrfConfiguration } from '@angular/common/http';
 import { NavigationActionTiming, RouterState, StoreRouterConnectingModule } from '@ngrx/router-store';
 import { EffectsModule } from '@ngrx/effects';
 import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field';
 import { HeaderComponent } from './ui/header/header.component';
 import { rootReducers } from './state';
-import { DropletsEffects } from './state/droplets/droplets.effects';
-import { BucketsEffects } from './state/buckets/buckets.effects';
 import { ErrorEffects } from './state/error/error.effects';
-import { ResourcesComponent } from './pages/resources/feature/resources.component';
+import { environment } from '../environments/environment';
 
 const entry = localStorage.getItem('disable-animations');
 let disableAnimations = '';
@@ -62,13 +61,19 @@ try {
         AppRoutingModule,
         BrowserAnimationsModule,
         HeaderComponent,
-        ResourcesComponent,
         StoreModule.forRoot(rootReducers),
         StoreRouterConnectingModule.forRoot({
             routerState: RouterState.Minimal,
             navigationActionTiming: NavigationActionTiming.PostActivation
         }),
-        EffectsModule.forRoot(DropletsEffects, BucketsEffects, ErrorEffects)
+        EffectsModule.forRoot(ErrorEffects),
+        StoreDevtoolsModule.instrument({
+            maxAge: 25,
+            logOnly: environment.production,
+            autoPause: true,
+            name: 'NiFi Registry',
+            trace: !environment.production
+        })
     ],
     providers: [
         disableAnimations === 'true' ? provideNoopAnimations() : provideAnimations(),

nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/error/feature/error.component.html

@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,17 +15,25 @@
  * limitations under the License.
  */
 
-@use '@angular/material' as mat;
+import { RouterModule, Routes } from '@angular/router';
+import { NgModule } from '@angular/core';
+import { ResourcesComponent } from './resources.component';
 
-.banner-container {
-    @include mat.button-density(-1);
-
-    .error-banner-message {
-        word-break: break-word;
+const routes: Routes = [
+    {
+        path: '',
+        component: ResourcesComponent,
+        children: [
+            {
+                path: ':id',
+                component: ResourcesComponent
+            }
+        ]
     }
+];
 
-    ul {
-        list-style-type: disc;
-        list-style-position: inside;
-    }
-}
+@NgModule({
+    imports: [RouterModule.forChild(routes)],
+    exports: [RouterModule]
+})
+export class ResourcesRoutingModule {}

nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/error/feature/error.component.scss

@@ -18,17 +18,19 @@
 <div class="pb-5 px-5 flex flex-col h-full">
     <div class="h-full flex flex-col">
         <h3 class="primary-color">Resources</h3>
+        <context-error-banner [context]="ErrorContextKey.GLOBAL"></context-error-banner>
         <div class="flex justify-between items-baseline">
             <droplet-table-filter
                 [buckets]="buckets"
                 [filterTerm]="filterTerm"
                 [filterBucket]="filterBucket"
                 [filterColumn]="filterColumn"
+                [filterableColumns]="filterableColumns"
                 [filteredCount]="dataSource.filteredData.length"
                 [totalCount]="dataSource.data.length"
                 (filterChanged)="applyFilter($event)"></droplet-table-filter>
             <div class="flex justify-end">
-                <button mat-icon-button class="primary-icon-button" (click)="openImportNewFlowDialog()">
+                <button mat-icon-button class="primary-icon-button" (click)="openImportNewDropletDialog()">
                     <i class="fa fa-plus"></i>
                 </button>
             </div>