apache · rfellows · Dec 1, 2023 · Nov 29, 2023 · Dec 1, 2023
diff --git a/...-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java b/...-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
@@ -102,6 +102,7 @@
 import org.apache.nifi.web.api.entity.CurrentUserEntity;
 import org.apache.nifi.web.api.entity.FlowAnalysisResultEntity;
 import org.apache.nifi.web.api.entity.FlowAnalysisRuleEntity;
+import org.apache.nifi.web.api.entity.FlowBreadcrumbEntity;
 import org.apache.nifi.web.api.entity.FlowComparisonEntity;
 import org.apache.nifi.web.api.entity.FlowConfigurationEntity;
 import org.apache.nifi.web.api.entity.FlowEntity;
@@ -1008,6 +1009,14 @@ Set<DocumentedTypeDTO> getControllerServiceTypes(final String serviceType, final
      */
     ProcessGroupFlowEntity getProcessGroupFlow(String groupId, boolean uiOnly);
 
+    /**
+     * Returns the breadcrumbs for the specified group.
+     *
+     * @param groupId group id
+     * @return the breadcrumbs
+     */
+    FlowBreadcrumbEntity getProcessGroupBreadcrumbs(String groupId);
+
     // ----------------------------------------
     // ProcessGroup methods
     // ----------------------------------------

diff --git a/...rk/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java b/...rk/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
@@ -297,6 +297,7 @@
 import org.apache.nifi.web.api.entity.CurrentUserEntity;
 import org.apache.nifi.web.api.entity.FlowAnalysisResultEntity;
 import org.apache.nifi.web.api.entity.FlowAnalysisRuleEntity;
+import org.apache.nifi.web.api.entity.FlowBreadcrumbEntity;
 import org.apache.nifi.web.api.entity.FlowComparisonEntity;
 import org.apache.nifi.web.api.entity.FlowConfigurationEntity;
 import org.apache.nifi.web.api.entity.FlowEntity;
@@ -4783,6 +4784,12 @@ public ProcessGroupFlowEntity getProcessGroupFlow(final String groupId, final bo
         return entityFactory.createProcessGroupFlowEntity(dtoFactory.createProcessGroupFlowDto(processGroup, groupStatus, revisionManager, this::getProcessGroupBulletins, uiOnly), permissions);
     }
 
+    @Override
+    public FlowBreadcrumbEntity getProcessGroupBreadcrumbs(final String groupId) {
+        final ProcessGroup processGroup = processGroupDAO.getProcessGroup(groupId);
+        return dtoFactory.createBreadcrumbEntity(processGroup);
+    }
+
     @Override
     public ProcessGroupEntity getProcessGroup(final String groupId) {
         final ProcessGroup processGroup = processGroupDAO.getProcessGroup(groupId);

diff --git a/...i-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FlowResource.java b/...i-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FlowResource.java
@@ -88,6 +88,7 @@
 import org.apache.nifi.web.api.entity.CurrentUserEntity;
 import org.apache.nifi.web.api.entity.FlowAnalysisResultEntity;
 import org.apache.nifi.web.api.entity.FlowAnalysisRuleTypesEntity;
+import org.apache.nifi.web.api.entity.FlowBreadcrumbEntity;
 import org.apache.nifi.web.api.entity.FlowConfigurationEntity;
 import org.apache.nifi.web.api.entity.FlowRegistryBucketEntity;
 import org.apache.nifi.web.api.entity.FlowRegistryBucketsEntity;
@@ -401,6 +402,43 @@ public Response getFlow(
         return generateOkResponse(entity).build();
     }
 
+    @GET
+    @Consumes(MediaType.WILDCARD)
+    @Produces(MediaType.APPLICATION_JSON)
+    @Path("process-groups/{id}/breadcrumbs")
+    @ApiOperation(
+            value = "Gets the breadcrumbs for a process group",
+            response = FlowBreadcrumbEntity.class,
+            authorizations = {
+                    @Authorization(value = "Read - /flow")
+            }
+    )
+    @ApiResponses(
+            value = {
+                    @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+                    @ApiResponse(code = 401, message = "Client could not be authenticated."),
+                    @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+                    @ApiResponse(code = 404, message = "The specified resource could not be found."),
+                    @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+            }
+    )
+    public Response getBreadcrumbs(
+            @ApiParam(
+                    value = "The process group id."
+            )
+            @PathParam("id") final String groupId) {
+
+        authorizeFlow();
+
+        if (isReplicateRequest()) {
+            return replicate(HttpMethod.GET);
+        }
+
+        // get the breadcrumbs for this process group
+        final FlowBreadcrumbEntity breadcrumbEntity = serviceFacade.getProcessGroupBreadcrumbs(groupId);
+        return generateOkResponse(breadcrumbEntity).build();
+    }
+
     /**
      * Retrieves the metrics of the entire flow.
      *

diff --git a/...framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java b/...framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java
@@ -1842,7 +1842,6 @@ public ControllerServiceReferencingComponentDTO createControllerServiceReferenci
        Collection<ValidationResult> validationErrors = null;
        if (component instanceof ProcessorNode) {
            final ProcessorNode node = ((ProcessorNode) component);
-           dto.setGroupId(node.getProcessGroup().getIdentifier());
            dto.setState(node.getScheduledState().name());
            dto.setActiveThreadCount(node.getActiveThreadCount());
            dto.setType(node.getComponentType());
@@ -1919,6 +1918,7 @@ public int compare(final PropertyDescriptor o1, final PropertyDescriptor o2) {
        orderedProperties.putAll(sortedProperties);
 
        // build the descriptor and property dtos
+       dto.setGroupId(processGroupId);
        dto.setDescriptors(new LinkedHashMap<String, PropertyDescriptorDTO>());
        dto.setProperties(new LinkedHashMap<String, String>());
        for (final Map.Entry<PropertyDescriptor, String> entry : orderedProperties.entrySet()) {
@@ -2091,7 +2091,7 @@ public RemoteProcessGroupDTO createRemoteProcessGroupDto(final RemoteProcessGrou
     * @param group group
     * @return dto
     */
-   private FlowBreadcrumbEntity createBreadcrumbEntity(final ProcessGroup group) {
+   public FlowBreadcrumbEntity createBreadcrumbEntity(final ProcessGroup group) {
        if (group == null) {
            return null;
        }

diff --git a/...dle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app-routing.module.ts b/...dle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app-routing.module.ts
@@ -45,7 +45,8 @@ const routes: Routes = [
     {
         path: '',
         canMatch: [authGuard],
-        loadChildren: () => import('./pages/canvas/feature/flow-designer.module').then((m) => m.FlowDesignerModule)
+        loadChildren: () =>
+            import('./pages/flow-designer/feature/flow-designer.module').then((m) => m.FlowDesignerModule)
     }
 ];
 

diff --git a/...work-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app.module.ts b/...work-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app.module.ts
@@ -20,7 +20,7 @@ import { BrowserModule } from '@angular/platform-browser';
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { FlowDesignerModule } from './pages/canvas/feature/flow-designer.module';
+import { FlowDesignerModule } from './pages/flow-designer/feature/flow-designer.module';
 import { StoreModule } from '@ngrx/store';
 import { EffectsModule } from '@ngrx/effects';
 import { StoreDevtoolsModule } from '@ngrx/store-devtools';

diff --git a/.../nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/canvas/ui/header/header.module.ts b/.../nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/canvas/ui/header/header.module.ts
diff --git a/...ifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/feature/counters.module.ts b/...ifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/feature/counters.module.ts
@@ -25,6 +25,7 @@ import { EffectsModule } from '@ngrx/effects';
 import { CounterListingEffects } from '../state/counter-listing/counter-listing.effects';
 import { CounterListingModule } from '../ui/counter-listing/counter-listing.module';
 import { ParameterContextListingModule } from '../../parameter-contexts/ui/parameter-context-listing/parameter-context-listing.module';
+import { MatDialogModule } from '@angular/material/dialog';
 
 @NgModule({
     declarations: [Counters],
@@ -35,7 +36,8 @@ import { ParameterContextListingModule } from '../../parameter-contexts/ui/param
         StoreModule.forFeature(countersFeatureKey, reducers),
         EffectsModule.forFeature(CounterListingEffects),
         CounterListingModule,
-        ParameterContextListingModule
+        ParameterContextListingModule,
+        MatDialogModule
     ]
 })
 export class CountersModule {}
diff --git a/...s/feature/flow-designer-routing.module.ts → ...r/feature/flow-designer-routing.module.ts b/...s/feature/flow-designer-routing.module.ts → ...r/feature/flow-designer-routing.module.ts
@@ -20,22 +20,28 @@ import { RouterModule, Routes } from '@angular/router';
 import { FlowDesigner } from './flow-designer.component';
 import { RootGroupRedirector } from '../ui/root/redirector/root-group-redirector.component';
 import { rootGroupGuard } from '../ui/root/guard/root-group.guard';
+import { Canvas } from '../ui/canvas/canvas.component';
+import { ControllerServices } from '../ui/controller-service/controller-services.component';
 
 const routes: Routes = [
     {
         path: 'process-groups/:processGroupId',
         component: FlowDesigner,
         children: [
-            { path: 'bulk/:ids', component: FlowDesigner },
             {
-                path: ':type/:id',
-                component: FlowDesigner,
-                children: [{ path: 'edit', component: FlowDesigner }]
+                path: 'controller-services',
+                loadChildren: () =>
+                    import('../ui/controller-service/controller-services.module').then(
+                        (m) => m.ControllerServicesModule
+                    )
+            },
+            {
+                path: '',
+                loadChildren: () => import('../ui/canvas/canvas.module').then((m) => m.CanvasModule)
             }
         ]
     },
     { path: '', component: RootGroupRedirector, canActivate: [rootGroupGuard] }
-    // { path: '**', component: FlowDesignerComponent }
 ];
 
 @NgModule({

diff --git a/...nvas/feature/flow-designer.component.html → ...gner/feature/flow-designer.component.html b/...nvas/feature/flow-designer.component.html → ...gner/feature/flow-designer.component.html
@@ -15,8 +15,4 @@
   ~ limitations under the License.
   -->
 
-<div class="flex flex-col h-screen justify-between">
-    <fd-header></fd-header>
-    <fd-canvas class="flex-1"></fd-canvas>
-    <fd-footer></fd-footer>
-</div>
+<router-outlet></router-outlet>
diff --git a/...nvas/feature/flow-designer.component.scss → ...gner/feature/flow-designer.component.scss b/...nvas/feature/flow-designer.component.scss → ...gner/feature/flow-designer.component.scss
diff --git a/...s/feature/flow-designer.component.spec.ts → ...r/feature/flow-designer.component.spec.ts b/...s/feature/flow-designer.component.spec.ts → ...r/feature/flow-designer.component.spec.ts
@@ -20,33 +20,16 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FlowDesigner } from './flow-designer.component';
 import { provideMockStore } from '@ngrx/store/testing';
 import { initialState } from '../state/flow/flow.reducer';
-import { Component } from '@angular/core';
+import { RouterTestingModule } from '@angular/router/testing';
 
 describe('FlowDesigner', () => {
     let component: FlowDesigner;
     let fixture: ComponentFixture<FlowDesigner>;
 
-    @Component({
-        selector: 'fd-header',
-        template: ''
-    })
-    class MockHeader {}
-
-    @Component({
-        selector: 'fd-canvas',
-        template: ''
-    })
-    class MockCanvas {}
-
-    @Component({
-        selector: 'fd-footer',
-        template: ''
-    })
-    class MockFooter {}
-
     beforeEach(() => {
         TestBed.configureTestingModule({
-            declarations: [FlowDesigner, MockHeader, MockCanvas, MockFooter],
+            declarations: [FlowDesigner],
+            imports: [RouterTestingModule],
             providers: [
                 provideMockStore({
                     initialState

diff --git a/...canvas/feature/flow-designer.component.ts → ...signer/feature/flow-designer.component.ts b/...canvas/feature/flow-designer.component.ts → ...signer/feature/flow-designer.component.ts
diff --git a/...es/canvas/feature/flow-designer.module.ts → ...-designer/feature/flow-designer.module.ts b/...es/canvas/feature/flow-designer.module.ts → ...-designer/feature/flow-designer.module.ts
@@ -19,28 +19,23 @@ import { NgModule } from '@angular/core';
 import { CommonModule, NgOptimizedImage } from '@angular/common';
 import { FlowDesigner } from './flow-designer.component';
 import { FlowDesignerRoutingModule } from './flow-designer-routing.module';
-import { HeaderModule } from '../ui/header/header.module';
-import { FooterModule } from '../ui/footer/footer.module';
-import { CanvasModule } from '../ui/canvas/canvas.module';
 import { StoreModule } from '@ngrx/store';
 import { EffectsModule } from '@ngrx/effects';
 import { FlowEffects } from '../state/flow/flow.effects';
 import { TransformEffects } from '../state/transform/transform.effects';
 import { VersionControlTip } from '../ui/common/tooltips/version-control-tip/version-control-tip.component';
 import { canvasFeatureKey, reducers } from '../state';
 import { MatDialogModule } from '@angular/material/dialog';
+import { ControllerServicesEffects } from '../state/controller-services/controller-services.effects';
 
 @NgModule({
     declarations: [FlowDesigner, VersionControlTip],
     exports: [FlowDesigner],
     imports: [
         CommonModule,
-        HeaderModule,
-        CanvasModule,
-        FooterModule,
         FlowDesignerRoutingModule,
         StoreModule.forFeature(canvasFeatureKey, reducers),
-        EffectsModule.forFeature(FlowEffects, TransformEffects),
+        EffectsModule.forFeature(FlowEffects, TransformEffects, ControllerServicesEffects),
         NgOptimizedImage,
         MatDialogModule
     ]

diff --git a/...vior/connectable-behavior.service.spec.ts → ...vior/connectable-behavior.service.spec.ts b/...vior/connectable-behavior.service.spec.ts → ...vior/connectable-behavior.service.spec.ts
@@ -25,14 +25,17 @@ import { flowFeatureKey } from '../../state/flow';
 import { selectFlowState } from '../../state/flow/flow.selectors';
 import { CanvasState } from '../../state';
 import { transformFeatureKey } from '../../state/transform';
+import { controllerServicesFeatureKey } from '../../state/controller-services';
+import * as fromControllerServices from '../../state/controller-services/controller-services.reducer';
 
 describe('ConnectableBehavior', () => {
     let service: ConnectableBehavior;
 
     beforeEach(() => {
         const initialState: CanvasState = {
             [flowFeatureKey]: fromFlow.initialState,
-            [transformFeatureKey]: fromTransform.initialState
+            [transformFeatureKey]: fromTransform.initialState,
+            [controllerServicesFeatureKey]: fromControllerServices.initialState
         };
 
         TestBed.configureTestingModule({

diff --git a/.../behavior/connectable-behavior.service.ts → .../behavior/connectable-behavior.service.ts b/.../behavior/connectable-behavior.service.ts → .../behavior/connectable-behavior.service.ts
diff --git a/...havior/draggable-behavior.service.spec.ts → ...havior/draggable-behavior.service.spec.ts b/...havior/draggable-behavior.service.spec.ts → ...havior/draggable-behavior.service.spec.ts
@@ -22,19 +22,21 @@ import * as fromFlow from '../../state/flow/flow.reducer';
 import * as fromTransform from '../../state/transform/transform.reducer';
 import { provideMockStore } from '@ngrx/store/testing';
 import { selectTransform } from '../../state/transform/transform.selectors';
-import { initialState } from '../../state/transform/transform.reducer';
 import { CanvasState } from '../../state';
 import { flowFeatureKey } from '../../state/flow';
 import { transformFeatureKey } from '../../state/transform';
 import { selectFlowState } from '../../state/flow/flow.selectors';
+import { controllerServicesFeatureKey } from '../../state/controller-services';
+import * as fromControllerServices from '../../state/controller-services/controller-services.reducer';
 
 describe('DraggableBehavior', () => {
     let service: DraggableBehavior;
 
     beforeEach(() => {
         const initialState: CanvasState = {
             [flowFeatureKey]: fromFlow.initialState,
-            [transformFeatureKey]: fromTransform.initialState
+            [transformFeatureKey]: fromTransform.initialState,
+            [controllerServicesFeatureKey]: fromControllerServices.initialState
         };
 
         TestBed.configureTestingModule({

diff --git a/...ce/behavior/draggable-behavior.service.ts → ...ce/behavior/draggable-behavior.service.ts b/...ce/behavior/draggable-behavior.service.ts → ...ce/behavior/draggable-behavior.service.ts
diff --git a/...ehavior/editable-behavior.service.spec.ts → ...ehavior/editable-behavior.service.spec.ts b/...ehavior/editable-behavior.service.spec.ts → ...ehavior/editable-behavior.service.spec.ts
@@ -26,13 +26,16 @@ import * as fromFlow from '../../state/flow/flow.reducer';
 import { transformFeatureKey } from '../../state/transform';
 import * as fromTransform from '../../state/transform/transform.reducer';
 import { selectTransform } from '../../state/transform/transform.selectors';
+import { controllerServicesFeatureKey } from '../../state/controller-services';
+import * as fromControllerServices from '../../state/controller-services/controller-services.reducer';
 
 describe('EditableBehaviorService', () => {
     let service: EditableBehavior;
 
     const initialState: CanvasState = {
         [flowFeatureKey]: fromFlow.initialState,
-        [transformFeatureKey]: fromTransform.initialState
+        [transformFeatureKey]: fromTransform.initialState,
+        [controllerServicesFeatureKey]: fromControllerServices.initialState
     };
 
     beforeEach(() => {

diff --git a/...ice/behavior/editable-behavior.service.ts → ...ice/behavior/editable-behavior.service.ts b/...ice/behavior/editable-behavior.service.ts → ...ice/behavior/editable-behavior.service.ts
diff --git a/...ehavior/position-behavior.service.spec.ts → ...ehavior/position-behavior.service.spec.ts b/...ehavior/position-behavior.service.spec.ts → ...ehavior/position-behavior.service.spec.ts
diff --git a/...ice/behavior/position-behavior.service.ts → ...ice/behavior/position-behavior.service.ts b/...ice/behavior/position-behavior.service.ts → ...ice/behavior/position-behavior.service.ts