From 9eab2b8deb7f7d36078305c86c935106558b2e58 Mon Sep 17 00:00:00 2001
From: ThibaudAv <thibaud.avenier@gmail.com>
Date: Thu, 17 Oct 2024 18:17:28 +0200
Subject: [PATCH] feat: ps - rework executionPhase & policy to use FlowPhase

We need to keep PS compatible with all APIM < 4.6
---
 ...io-ps-flow-details-phase-step.component.ts |   6 +-
 .../gio-ps-flow-details-phase.component.html  |   2 +-
 .../gio-ps-flow-details-phase.component.ts    |   6 +-
 .../gio-ps-flow-details.component.html        |  12 +-
 ...-ps-policies-catalog-dialog.component.html |   4 +-
 ...-policies-catalog-dialog.component.spec.ts |  49 +++--
 ...io-ps-policies-catalog-dialog.component.ts |  30 +--
 .../gio-ps-policies-catalog-dialog.stories.ts |  28 +--
 .../gio-ps-step-edit-dialog.component.html    |   2 +-
 .../gio-ps-step-edit-dialog.component.spec.ts |   2 +-
 .../gio-ps-step-edit-dialog.component.ts      |   8 +-
 .../gio-ps-step-edit-dialog.stories.ts        |   2 +-
 .../step-form/gio-ps-step-form.component.ts   |  10 +-
 .../src/lib/models/ApiProtocolType.ts         |  17 ++
 .../src/lib/models/{flow => }/ApiType.ts      |   3 +-
 .../src/lib/models/flow/index.ts              |   1 -
 .../src/lib/models/index.ts                   |   2 +
 .../src/lib/models/policy/Policy.fixture.ts   |  84 ++++++---
 .../src/lib/models/policy/Policy.ts           |  50 ++++-
 .../policy/SharedPolicyGroupPolicy.fixture.ts |   4 +-
 .../models/policy/SharedPolicyGroupPolicy.ts  |   6 +-
 .../gio-policy-group-studio.component.html    |   2 +-
 .../gio-policy-group-studio.component.spec.ts | 177 +++++++++++++++++-
 .../gio-policy-group-studio.component.ts      |  51 ++++-
 .../gio-policy-studio.component.ts            |  16 +-
 25 files changed, 444 insertions(+), 130 deletions(-)
 create mode 100644 projects/ui-policy-studio-angular/src/lib/models/ApiProtocolType.ts
 rename projects/ui-policy-studio-angular/src/lib/models/{flow => }/ApiType.ts (91%)

diff --git a/projects/ui-policy-studio-angular/src/lib/components/flow-details-phase-step/gio-ps-flow-details-phase-step.component.ts b/projects/ui-policy-studio-angular/src/lib/components/flow-details-phase-step/gio-ps-flow-details-phase-step.component.ts
index e77000891..ecc686003 100644
--- a/projects/ui-policy-studio-angular/src/lib/components/flow-details-phase-step/gio-ps-flow-details-phase-step.component.ts
+++ b/projects/ui-policy-studio-angular/src/lib/components/flow-details-phase-step/gio-ps-flow-details-phase-step.component.ts
@@ -27,7 +27,7 @@ import {
   GioPolicyStudioStepEditDialogData,
   GioPolicyStudioStepEditDialogResult,
 } from '../step-edit-dialog/gio-ps-step-edit-dialog.component';
-import { ExecutionPhase, isPolicy, isSharedPolicyGroupPolicy, Step, GenericPolicy } from '../../models';
+import { FlowPhase, isPolicy, isSharedPolicyGroupPolicy, Step, GenericPolicy } from '../../models';
 
 @Component({
   standalone: true,
@@ -47,7 +47,7 @@ export class GioPolicyStudioDetailsPhaseStepComponent implements OnChanges {
   public genericPolicies: GenericPolicy[] = [];
 
   @Input({ required: true })
-  public executionPhase!: ExecutionPhase;
+  public flowPhase!: FlowPhase;
 
   @Output()
   public stepChange = new EventEmitter<Step>();
@@ -120,7 +120,7 @@ ${this.policyNotFound === 'SHARED_POLICY_GROUP' ? 'Note: The Gateway will ignore
             readOnly: this.readOnly,
             genericPolicy: this.genericPolicy,
             step: this.step,
-            executionPhase: this.executionPhase,
+            flowPhase: this.flowPhase,
           },
           role: 'alertdialog',
           id: 'gioPolicyStudioPolicyFormDialog',
diff --git a/projects/ui-policy-studio-angular/src/lib/components/flow-details-phase/gio-ps-flow-details-phase.component.html b/projects/ui-policy-studio-angular/src/lib/components/flow-details-phase/gio-ps-flow-details-phase.component.html
index b857796ee..55487f6c7 100644
--- a/projects/ui-policy-studio-angular/src/lib/components/flow-details-phase/gio-ps-flow-details-phase.component.html
+++ b/projects/ui-policy-studio-angular/src/lib/components/flow-details-phase/gio-ps-flow-details-phase.component.html
@@ -67,7 +67,7 @@
               [class.disabled]="readOnly || !stepVM.step.enabled"
               [genericPolicies]="genericPolicies"
               [step]="stepVM.step"
-              [executionPhase]="policyExecutionPhase"
+              [flowPhase]="policyFlowPhase"
               (stepChange)="onStepChange(stepVM.index, $event)"
               (deleted)="onStepDeleted(stepVM.index)"
               (disabled)="onStepDisabled(stepVM.index)"
diff --git a/projects/ui-policy-studio-angular/src/lib/components/flow-details-phase/gio-ps-flow-details-phase.component.ts b/projects/ui-policy-studio-angular/src/lib/components/flow-details-phase/gio-ps-flow-details-phase.component.ts
index 707fe96a8..6c4bf12f8 100644
--- a/projects/ui-policy-studio-angular/src/lib/components/flow-details-phase/gio-ps-flow-details-phase.component.ts
+++ b/projects/ui-policy-studio-angular/src/lib/components/flow-details-phase/gio-ps-flow-details-phase.component.ts
@@ -26,7 +26,7 @@ import {
   GioPolicyStudioPoliciesCatalogDialogData,
   GioPolicyStudioPoliciesCatalogDialogResult,
 } from '../policies-catalog-dialog/gio-ps-policies-catalog-dialog.component';
-import { ApiType, ConnectorInfo, ExecutionPhase, Step } from '../../models';
+import { ApiType, ConnectorInfo, FlowPhase, Step } from '../../models';
 import { GioPolicyStudioDetailsPhaseStepComponent } from '../flow-details-phase-step/gio-ps-flow-details-phase-step.component';
 import { GenericPolicy } from '../../models/policy/GenericPolicy';
 
@@ -79,7 +79,7 @@ export class GioPolicyStudioDetailsPhaseComponent implements OnChanges {
   public genericPolicies: GenericPolicy[] = [];
 
   @Input()
-  public policyExecutionPhase!: ExecutionPhase;
+  public policyFlowPhase!: FlowPhase;
 
   @Input()
   public trialUrl?: string;
@@ -136,7 +136,7 @@ export class GioPolicyStudioDetailsPhaseComponent implements OnChanges {
       >(GioPolicyStudioPoliciesCatalogDialogComponent, {
         data: {
           genericPolicies: this.genericPolicies,
-          executionPhase: this.policyExecutionPhase,
+          flowPhase: this.policyFlowPhase,
           apiType: this.apiType,
           trialUrl: this.trialUrl,
         },
diff --git a/projects/ui-policy-studio-angular/src/lib/components/flow-details/gio-ps-flow-details.component.html b/projects/ui-policy-studio-angular/src/lib/components/flow-details/gio-ps-flow-details.component.html
index db9249778..6951b571a 100644
--- a/projects/ui-policy-studio-angular/src/lib/components/flow-details/gio-ps-flow-details.component.html
+++ b/projects/ui-policy-studio-angular/src/lib/components/flow-details/gio-ps-flow-details.component.html
@@ -59,7 +59,7 @@
             [apiType]="apiType"
             [genericPolicies]="genericPolicies"
             [trialUrl]="trialUrl"
-            policyExecutionPhase="REQUEST"
+            policyFlowPhase="REQUEST"
             (stepsChange)="onStepsChange('request', $event)"
           ></gio-ps-flow-details-phase>
           <gio-ps-flow-details-phase
@@ -73,7 +73,7 @@
             [apiType]="apiType"
             [genericPolicies]="genericPolicies"
             [trialUrl]="trialUrl"
-            policyExecutionPhase="RESPONSE"
+            policyFlowPhase="RESPONSE"
             (stepsChange)="onStepsChange('response', $event)"
           ></gio-ps-flow-details-phase>
         </mat-tab>
@@ -89,7 +89,7 @@
             [apiType]="apiType"
             [genericPolicies]="genericPolicies"
             [trialUrl]="trialUrl"
-            policyExecutionPhase="MESSAGE_REQUEST"
+            policyFlowPhase="PUBLISH"
             (stepsChange)="onStepsChange('publish', $event)"
           ></gio-ps-flow-details-phase>
           <gio-ps-flow-details-phase
@@ -103,7 +103,7 @@
             [apiType]="apiType"
             [genericPolicies]="genericPolicies"
             [trialUrl]="trialUrl"
-            policyExecutionPhase="MESSAGE_RESPONSE"
+            policyFlowPhase="SUBSCRIBE"
             (stepsChange)="onStepsChange('subscribe', $event)"
           ></gio-ps-flow-details-phase>
         </mat-tab>
@@ -121,7 +121,7 @@
           [apiType]="apiType"
           [genericPolicies]="genericPolicies"
           [trialUrl]="trialUrl"
-          policyExecutionPhase="REQUEST"
+          policyFlowPhase="REQUEST"
           (stepsChange)="onStepsChange('request', $event)"
         ></gio-ps-flow-details-phase>
         <gio-ps-flow-details-phase
@@ -135,7 +135,7 @@
           [apiType]="apiType"
           [genericPolicies]="genericPolicies"
           [trialUrl]="trialUrl"
-          policyExecutionPhase="RESPONSE"
+          policyFlowPhase="RESPONSE"
           (stepsChange)="onStepsChange('response', $event)"
         ></gio-ps-flow-details-phase>
       </ng-container>
diff --git a/projects/ui-policy-studio-angular/src/lib/components/policies-catalog-dialog/gio-ps-policies-catalog-dialog.component.html b/projects/ui-policy-studio-angular/src/lib/components/policies-catalog-dialog/gio-ps-policies-catalog-dialog.component.html
index 127afca52..273f361f1 100644
--- a/projects/ui-policy-studio-angular/src/lib/components/policies-catalog-dialog/gio-ps-policies-catalog-dialog.component.html
+++ b/projects/ui-policy-studio-angular/src/lib/components/policies-catalog-dialog/gio-ps-policies-catalog-dialog.component.html
@@ -16,7 +16,7 @@
 
 -->
 <h2 mat-dialog-title class="title">
-  Policies for <span class="title__phase">{{ executionPhaseLabel }}</span> phase
+  Policies for <span class="title__phase">{{ flowPhaseLabel }}</span> phase
 
   <button class="title__closeBtn" mat-icon-button aria-label="Close dialog" [mat-dialog-close]="">
     <mat-icon svgIcon="gio:cancel"></mat-icon>
@@ -120,7 +120,7 @@ <h2 mat-dialog-title class="title">
 
   <gio-ps-step-form
     [genericPolicy]="selectedPolicy"
-    [executionPhase]="executionPhase"
+    [flowPhase]="flowPhase"
     (stepChange)="onStepChange($event)"
     (isValid)="onIsValid($event)"
   ></gio-ps-step-form>
diff --git a/projects/ui-policy-studio-angular/src/lib/components/policies-catalog-dialog/gio-ps-policies-catalog-dialog.component.spec.ts b/projects/ui-policy-studio-angular/src/lib/components/policies-catalog-dialog/gio-ps-policies-catalog-dialog.component.spec.ts
index 8f287ee56..143c7f5bf 100644
--- a/projects/ui-policy-studio-angular/src/lib/components/policies-catalog-dialog/gio-ps-policies-catalog-dialog.component.spec.ts
+++ b/projects/ui-policy-studio-angular/src/lib/components/policies-catalog-dialog/gio-ps-policies-catalog-dialog.component.spec.ts
@@ -27,7 +27,7 @@ import { MatInputHarness } from '@angular/material/input/testing';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 
 import { fakeAllPolicies } from '../../models/index-testing';
-import { ApiType, ExecutionPhase, isPolicy, isSharedPolicyGroupPolicy, toGenericPolicies, GenericPolicy } from '../../models';
+import { ApiType, FlowPhase, isPolicy, isSharedPolicyGroupPolicy, toGenericPolicies, GenericPolicy, fromPolicyInput } from '../../models';
 import { GioPolicyStudioService } from '../../policy-studio/gio-policy-studio.service';
 import { fakePolicyDocumentation, fakePolicySchema } from '../../models/policy/PolicySchema.fixture';
 import { fakeAllSharedPolicyGroupPolicies } from '../../models/policy/SharedPolicyGroupPolicy.fixture';
@@ -71,7 +71,7 @@ describe('GioPolicyStudioPoliciesCatalogDialogComponent', () => {
   let fixture: ComponentFixture<TestComponent>;
   let loader: HarnessLoader;
 
-  const createTestingComponent = (apiType: ApiType, executionPhase: ExecutionPhase) => {
+  const createTestingComponent = (apiType: ApiType, flowPhase: FlowPhase) => {
     TestBed.configureTestingModule({
       declarations: [TestComponent],
       imports: [
@@ -103,14 +103,14 @@ describe('GioPolicyStudioPoliciesCatalogDialogComponent', () => {
     component = fixture.componentInstance;
     component.dialogData = {
       apiType,
-      genericPolicies: toGenericPolicies(fakeAllPolicies(), fakeAllSharedPolicyGroupPolicies()),
-      executionPhase,
+      genericPolicies: toGenericPolicies(fakeAllPolicies().map(fromPolicyInput), fakeAllSharedPolicyGroupPolicies()),
+      flowPhase,
       trialUrl: 'https://gravitee.io/self-hosted-trial',
     };
     loader = TestbedHarnessEnvironment.documentRootLoader(fixture);
   };
 
-  describe('When ApiType = MESSAGE and ExecutionPhase = REQUEST', () => {
+  describe('When ApiType = MESSAGE and FlowPhase = REQUEST', () => {
     beforeEach(() => {
       createTestingComponent('MESSAGE', 'REQUEST');
     });
@@ -118,7 +118,7 @@ describe('GioPolicyStudioPoliciesCatalogDialogComponent', () => {
     it('should display policies catalog', async () => {
       await componentTestingOpenDialog();
 
-      await expectPoliciesCatalogContent('Request', p => isPolicy(p) && p.message?.includes('REQUEST'));
+      await expectPoliciesCatalogContent('Request', p => isPolicy(p) && p.flowPhaseCompatibility?.HTTP_MESSAGE?.includes('REQUEST'));
 
       await expectPoliciesCatalogContent('Request', p => isSharedPolicyGroupPolicy(p) && p.apiType === 'MESSAGE' && p.phase === 'REQUEST');
     });
@@ -194,16 +194,16 @@ describe('GioPolicyStudioPoliciesCatalogDialogComponent', () => {
 
       const policiesCatalogDialog = await loader.getHarness(GioPolicyStudioPoliciesCatalogDialogHarness);
 
-      expect(await policiesCatalogDialog.getPoliciesName()).toHaveLength(10);
+      expect(await policiesCatalogDialog.getPoliciesName()).toHaveLength(11);
       await policiesCatalogDialog.selectCategoryFilter('Others');
-      expect(await policiesCatalogDialog.getPoliciesName()).toHaveLength(4);
+      expect(await policiesCatalogDialog.getPoliciesName()).toHaveLength(5);
 
       await policiesCatalogDialog.searchFilter('Policy to test UI');
       expect(await policiesCatalogDialog.getPoliciesName()).toHaveLength(1);
     });
   });
 
-  describe('When ApiType = MESSAGE and ExecutionPhase = RESPONSE', () => {
+  describe('When ApiType = MESSAGE and FlowPhase = RESPONSE', () => {
     beforeEach(() => {
       createTestingComponent('MESSAGE', 'RESPONSE');
     });
@@ -211,7 +211,7 @@ describe('GioPolicyStudioPoliciesCatalogDialogComponent', () => {
     it('should display policies catalog', async () => {
       await componentTestingOpenDialog();
 
-      await expectPoliciesCatalogContent('Response', p => isPolicy(p) && p.message?.includes('RESPONSE'));
+      await expectPoliciesCatalogContent('Response', p => isPolicy(p) && p.flowPhaseCompatibility?.HTTP_MESSAGE?.includes('RESPONSE'));
       await expectPoliciesCatalogContent(
         'Response',
         p => isSharedPolicyGroupPolicy(p) && p.apiType === 'MESSAGE' && p.phase === 'RESPONSE',
@@ -219,19 +219,16 @@ describe('GioPolicyStudioPoliciesCatalogDialogComponent', () => {
     });
   });
 
-  describe('When ApiType = MESSAGE and ExecutionPhase = MESSAGE_REQUEST', () => {
+  describe('When ApiType = MESSAGE and FlowPhase = PUBLISH', () => {
     beforeEach(() => {
-      createTestingComponent('MESSAGE', 'MESSAGE_REQUEST');
+      createTestingComponent('MESSAGE', 'PUBLISH');
     });
 
     it('should display policies catalog', async () => {
       await componentTestingOpenDialog();
 
-      await expectPoliciesCatalogContent('Publish', p => isPolicy(p) && p.message?.includes('MESSAGE_REQUEST'));
-      await expectPoliciesCatalogContent(
-        'Publish',
-        p => isSharedPolicyGroupPolicy(p) && p.apiType === 'MESSAGE' && p.phase === 'MESSAGE_REQUEST',
-      );
+      await expectPoliciesCatalogContent('Publish', p => isPolicy(p) && p.flowPhaseCompatibility?.HTTP_MESSAGE?.includes('PUBLISH'));
+      await expectPoliciesCatalogContent('Publish', p => isSharedPolicyGroupPolicy(p) && p.apiType === 'MESSAGE' && p.phase === 'PUBLISH');
     });
 
     it('should select a policy and add it with messageCondition', async () => {
@@ -270,23 +267,23 @@ describe('GioPolicyStudioPoliciesCatalogDialogComponent', () => {
     });
   });
 
-  describe('When ApiType = MESSAGE and ExecutionPhase = MESSAGE_RESPONSE', () => {
+  describe('When ApiType = MESSAGE and FlowPhase = SUBSCRIBE', () => {
     beforeEach(() => {
-      createTestingComponent('MESSAGE', 'MESSAGE_RESPONSE');
+      createTestingComponent('MESSAGE', 'SUBSCRIBE');
     });
 
     it('should display policies catalog', async () => {
       await componentTestingOpenDialog();
 
-      await expectPoliciesCatalogContent('Subscribe', p => isPolicy(p) && p.message?.includes('MESSAGE_RESPONSE'));
+      await expectPoliciesCatalogContent('Subscribe', p => isPolicy(p) && p.flowPhaseCompatibility?.HTTP_MESSAGE?.includes('SUBSCRIBE'));
       await expectPoliciesCatalogContent(
         'Subscribe',
-        p => isSharedPolicyGroupPolicy(p) && p.apiType === 'MESSAGE' && p.phase === 'MESSAGE_RESPONSE',
+        p => isSharedPolicyGroupPolicy(p) && p.apiType === 'MESSAGE' && p.phase === 'SUBSCRIBE',
       );
     });
   });
 
-  describe('When ApiType = PROXY and ExecutionPhase = REQUEST', () => {
+  describe('When ApiType = PROXY and FlowPhase = REQUEST', () => {
     beforeEach(() => {
       createTestingComponent('PROXY', 'REQUEST');
     });
@@ -294,7 +291,7 @@ describe('GioPolicyStudioPoliciesCatalogDialogComponent', () => {
     it('should display policies catalog', async () => {
       await componentTestingOpenDialog();
 
-      await expectPoliciesCatalogContent('Request', p => isPolicy(p) && p.proxy?.includes('REQUEST'));
+      await expectPoliciesCatalogContent('Request', p => isPolicy(p) && p.flowPhaseCompatibility?.HTTP_PROXY?.includes('REQUEST'));
       await expectPoliciesCatalogContent('Request', p => isSharedPolicyGroupPolicy(p) && p.apiType === 'PROXY' && p.phase === 'REQUEST');
     });
 
@@ -309,7 +306,7 @@ describe('GioPolicyStudioPoliciesCatalogDialogComponent', () => {
     });
   });
 
-  describe('When ApiType = PROXY and ExecutionPhase = RESPONSE', () => {
+  describe('When ApiType = PROXY and FlowPhase = RESPONSE', () => {
     beforeEach(() => {
       createTestingComponent('PROXY', 'RESPONSE');
     });
@@ -317,7 +314,7 @@ describe('GioPolicyStudioPoliciesCatalogDialogComponent', () => {
     it('should display policies catalog', async () => {
       await componentTestingOpenDialog();
 
-      await expectPoliciesCatalogContent('Response', p => isPolicy(p) && p.proxy?.includes('RESPONSE'));
+      await expectPoliciesCatalogContent('Response', p => isPolicy(p) && p.flowPhaseCompatibility?.HTTP_PROXY?.includes('RESPONSE'));
       await expectPoliciesCatalogContent('Response', p => isSharedPolicyGroupPolicy(p) && p.apiType === 'PROXY' && p.phase === 'RESPONSE');
     });
   });
@@ -328,7 +325,7 @@ describe('GioPolicyStudioPoliciesCatalogDialogComponent', () => {
     expect(await phaseDialog.getPhase()).toEqual(phaseLabel);
     expect(await phaseDialog.getPoliciesName()).toStrictEqual(
       expect.arrayContaining(
-        toGenericPolicies(fakeAllPolicies(), fakeAllSharedPolicyGroupPolicies())
+        toGenericPolicies(fakeAllPolicies().map(fromPolicyInput), fakeAllSharedPolicyGroupPolicies())
           .filter(policiesFilter)
           .map(policy => policy.name),
       ),
diff --git a/projects/ui-policy-studio-angular/src/lib/components/policies-catalog-dialog/gio-ps-policies-catalog-dialog.component.ts b/projects/ui-policy-studio-angular/src/lib/components/policies-catalog-dialog/gio-ps-policies-catalog-dialog.component.ts
index 2b1cc75af..8db322d0a 100644
--- a/projects/ui-policy-studio-angular/src/lib/components/policies-catalog-dialog/gio-ps-policies-catalog-dialog.component.ts
+++ b/projects/ui-policy-studio-angular/src/lib/components/policies-catalog-dialog/gio-ps-policies-catalog-dialog.component.ts
@@ -27,23 +27,25 @@ import { GioBannerModule, GioIconsModule } from '@gravitee/ui-particles-angular'
 import { MatChipsModule } from '@angular/material/chips';
 import { MatTooltip } from '@angular/material/tooltip';
 
-import { ApiType, ExecutionPhase, GenericPolicy, isPolicy, isSharedPolicyGroupPolicy, Step } from '../../models';
+import { ApiType, FlowPhase, GenericPolicy, isPolicy, isSharedPolicyGroupPolicy, Step } from '../../models';
 import { GioPolicyStudioStepFormComponent } from '../step-form/gio-ps-step-form.component';
 
 export type GioPolicyStudioPoliciesCatalogDialogData = {
   genericPolicies: GenericPolicy[];
-  executionPhase: ExecutionPhase;
+  flowPhase: FlowPhase;
   apiType: ApiType;
   trialUrl?: string;
 };
 
 export type GioPolicyStudioPoliciesCatalogDialogResult = undefined | Step;
 
-const executionPhaseLabels: Record<ExecutionPhase, string> = {
+const flowPhaseLabels: Record<FlowPhase, string> = {
   REQUEST: 'Request',
   RESPONSE: 'Response',
-  MESSAGE_REQUEST: 'Publish',
-  MESSAGE_RESPONSE: 'Subscribe',
+  PUBLISH: 'Publish',
+  SUBSCRIBE: 'Subscribe',
+  CONNECT: 'Connect',
+  INTERACT: 'Interact',
 };
 
 type PolicyVM = {
@@ -78,8 +80,8 @@ type PolicyVM = {
 export class GioPolicyStudioPoliciesCatalogDialogComponent implements OnDestroy {
   public policies: PolicyVM[] = [];
 
-  public executionPhase!: ExecutionPhase;
-  public executionPhaseLabel!: string;
+  public flowPhase!: FlowPhase;
+  public flowPhaseLabel!: string;
 
   public selectedPolicy?: GenericPolicy;
 
@@ -106,19 +108,23 @@ export class GioPolicyStudioPoliciesCatalogDialogComponent implements OnDestroy
     public dialogRef: MatDialogRef<GioPolicyStudioPoliciesCatalogDialogComponent, GioPolicyStudioPoliciesCatalogDialogResult>,
     @Inject(MAT_DIALOG_DATA) flowDialogData: GioPolicyStudioPoliciesCatalogDialogData,
   ) {
-    this.executionPhase = flowDialogData.executionPhase;
-    this.executionPhaseLabel = executionPhaseLabels[flowDialogData.executionPhase];
+    this.flowPhase = flowDialogData.flowPhase;
+    this.flowPhaseLabel = flowPhaseLabels[flowDialogData.flowPhase];
 
     this.allPolicies = flowDialogData.genericPolicies
       .filter(genericPolicy => {
         if (isPolicy(genericPolicy)) {
           if (flowDialogData.apiType === 'PROXY') {
-            return genericPolicy.proxy?.includes(flowDialogData.executionPhase);
+            return genericPolicy.flowPhaseCompatibility?.HTTP_PROXY?.includes(flowDialogData.flowPhase);
+          } else if (flowDialogData.apiType === 'MESSAGE') {
+            return genericPolicy.flowPhaseCompatibility?.HTTP_MESSAGE?.includes(flowDialogData.flowPhase);
+          } else {
+            // TODO: Implement for NATIVE API
+            throw new Error('Not implemented');
           }
-          return genericPolicy.message?.includes(flowDialogData.executionPhase);
         }
         if (isSharedPolicyGroupPolicy(genericPolicy)) {
-          return genericPolicy.apiType === flowDialogData.apiType && genericPolicy.phase === flowDialogData.executionPhase;
+          return genericPolicy.apiType === flowDialogData.apiType && genericPolicy.phase === flowDialogData.flowPhase;
         }
         // Not expected
         throw new Error('Unknown policy type');
diff --git a/projects/ui-policy-studio-angular/src/lib/components/policies-catalog-dialog/gio-ps-policies-catalog-dialog.stories.ts b/projects/ui-policy-studio-angular/src/lib/components/policies-catalog-dialog/gio-ps-policies-catalog-dialog.stories.ts
index 775928a72..59c14a267 100644
--- a/projects/ui-policy-studio-angular/src/lib/components/policies-catalog-dialog/gio-ps-policies-catalog-dialog.stories.ts
+++ b/projects/ui-policy-studio-angular/src/lib/components/policies-catalog-dialog/gio-ps-policies-catalog-dialog.stories.ts
@@ -25,7 +25,7 @@ import { POLICIES_V4_UNREGISTERED_ICON, fakeAllPolicies } from '../../models/ind
 import { matIconRegisterProvider } from '../../../storybook-utils/mat-icon-register.provider';
 import { GioPolicyStudioService } from '../../policy-studio/gio-policy-studio.service';
 import { fakePolicyDocumentation, fakePolicySchema } from '../../models/policy/PolicySchema.fixture';
-import { toGenericPolicies } from '../../models';
+import { fromPolicyInput, toGenericPolicies } from '../../models';
 import { fakeAllSharedPolicyGroupPolicies } from '../../models/policy/SharedPolicyGroupPolicy.fixture';
 
 import {
@@ -103,8 +103,8 @@ export default {
     props: {
       dialogData: {
         apiType: args.apiType,
-        executionPhase: args.executionPhase,
-        genericPolicies: toGenericPolicies(fakeAllPolicies(), fakeAllSharedPolicyGroupPolicies()),
+        flowPhase: args.flowPhase,
+        genericPolicies: toGenericPolicies(fakeAllPolicies().map(fromPolicyInput), fakeAllSharedPolicyGroupPolicies()),
         trialUrl: 'https://gravitee.io/self-hosted-trial',
       },
     },
@@ -117,7 +117,7 @@ export default {
 export const NoPolicies: StoryObj = {
   name: 'No policies',
   args: {
-    executionPhase: 'UNKNOWN',
+    flowPhase: 'UNKNOWN',
     apiType: 'PROXY',
   },
   play: context => {
@@ -129,7 +129,7 @@ export const NoPolicies: StoryObj = {
 export const PROXY_REQUEST: StoryObj = {
   name: 'PROXY / REQUEST',
   args: {
-    executionPhase: 'REQUEST',
+    flowPhase: 'REQUEST',
     apiType: 'PROXY',
   },
   play: context => {
@@ -141,7 +141,7 @@ export const PROXY_REQUEST: StoryObj = {
 export const PROXY_RESPONSE: StoryObj = {
   name: 'PROXY / RESPONSE',
   args: {
-    executionPhase: 'RESPONSE',
+    flowPhase: 'RESPONSE',
     apiType: 'PROXY',
   },
   play: context => {
@@ -153,7 +153,7 @@ export const PROXY_RESPONSE: StoryObj = {
 export const MESSAGE_REQUEST: StoryObj = {
   name: 'MESSAGE / REQUEST',
   args: {
-    executionPhase: 'REQUEST',
+    flowPhase: 'REQUEST',
     apiType: 'MESSAGE',
   },
   play: context => {
@@ -165,7 +165,7 @@ export const MESSAGE_REQUEST: StoryObj = {
 export const MESSAGE_RESPONSE: StoryObj = {
   name: 'MESSAGE / RESPONSE',
   args: {
-    executionPhase: 'RESPONSE',
+    flowPhase: 'RESPONSE',
     apiType: 'MESSAGE',
   },
   play: context => {
@@ -174,10 +174,10 @@ export const MESSAGE_RESPONSE: StoryObj = {
   },
 };
 
-export const MESSAGE_MESSAGE_REQUEST: StoryObj = {
-  name: 'MESSAGE / MESSAGE_REQUEST',
+export const MESSAGE_PUBLISH: StoryObj = {
+  name: 'MESSAGE / PUBLISH',
   args: {
-    executionPhase: 'MESSAGE_REQUEST',
+    flowPhase: 'PUBLISH',
     apiType: 'MESSAGE',
   },
   play: context => {
@@ -186,10 +186,10 @@ export const MESSAGE_MESSAGE_REQUEST: StoryObj = {
   },
 };
 
-export const MESSAGE_MESSAGE_RESPONSE: StoryObj = {
-  name: 'MESSAGE / MESSAGE_RESPONSE',
+export const MESSAGE_SUBSCRIBE: StoryObj = {
+  name: 'MESSAGE / SUBSCRIBE',
   args: {
-    executionPhase: 'MESSAGE_RESPONSE',
+    flowPhase: 'SUBSCRIBE',
     apiType: 'MESSAGE',
   },
   play: context => {
diff --git a/projects/ui-policy-studio-angular/src/lib/components/step-edit-dialog/gio-ps-step-edit-dialog.component.html b/projects/ui-policy-studio-angular/src/lib/components/step-edit-dialog/gio-ps-step-edit-dialog.component.html
index 94230aee6..74b41c6e5 100644
--- a/projects/ui-policy-studio-angular/src/lib/components/step-edit-dialog/gio-ps-step-edit-dialog.component.html
+++ b/projects/ui-policy-studio-angular/src/lib/components/step-edit-dialog/gio-ps-step-edit-dialog.component.html
@@ -38,7 +38,7 @@ <h2 mat-dialog-title class="title">
   <gio-ps-step-form
     [readOnly]="readOnly"
     [genericPolicy]="genericPolicy"
-    [executionPhase]="executionPhase"
+    [flowPhase]="flowPhase"
     [(step)]="step"
     (isValid)="isValid = $event"
   ></gio-ps-step-form>
diff --git a/projects/ui-policy-studio-angular/src/lib/components/step-edit-dialog/gio-ps-step-edit-dialog.component.spec.ts b/projects/ui-policy-studio-angular/src/lib/components/step-edit-dialog/gio-ps-step-edit-dialog.component.spec.ts
index 8e8ced5a9..c26c8a268 100644
--- a/projects/ui-policy-studio-angular/src/lib/components/step-edit-dialog/gio-ps-step-edit-dialog.component.spec.ts
+++ b/projects/ui-policy-studio-angular/src/lib/components/step-edit-dialog/gio-ps-step-edit-dialog.component.spec.ts
@@ -107,7 +107,7 @@ describe('GioPolicyStudioStepEditDialogComponent', () => {
         type: 'POLICY',
       },
       step,
-      executionPhase: 'REQUEST',
+      flowPhase: 'REQUEST',
     };
     loader = TestbedHarnessEnvironment.documentRootLoader(fixture);
   };
diff --git a/projects/ui-policy-studio-angular/src/lib/components/step-edit-dialog/gio-ps-step-edit-dialog.component.ts b/projects/ui-policy-studio-angular/src/lib/components/step-edit-dialog/gio-ps-step-edit-dialog.component.ts
index 4c4750012..4984c48c4 100644
--- a/projects/ui-policy-studio-angular/src/lib/components/step-edit-dialog/gio-ps-step-edit-dialog.component.ts
+++ b/projects/ui-policy-studio-angular/src/lib/components/step-edit-dialog/gio-ps-step-edit-dialog.component.ts
@@ -19,13 +19,13 @@ import { GioIconsModule } from '@gravitee/ui-particles-angular';
 import { CommonModule } from '@angular/common';
 import { MatButtonModule } from '@angular/material/button';
 
-import { ExecutionPhase, Step, GenericPolicy } from '../../models';
+import { FlowPhase, Step, GenericPolicy } from '../../models';
 import { GioPolicyStudioStepFormComponent } from '../step-form/gio-ps-step-form.component';
 
 export type GioPolicyStudioStepEditDialogData = {
   genericPolicy: GenericPolicy;
   step: Step;
-  executionPhase: ExecutionPhase;
+  flowPhase: FlowPhase;
   readOnly?: boolean;
 };
 
@@ -41,7 +41,7 @@ export type GioPolicyStudioStepEditDialogResult = undefined | Step;
 export class GioPolicyStudioStepEditDialogComponent {
   public genericPolicy!: GenericPolicy;
   public step!: Step;
-  public executionPhase!: ExecutionPhase;
+  public flowPhase!: FlowPhase;
 
   public isValid = false;
   public readOnly = false;
@@ -50,7 +50,7 @@ export class GioPolicyStudioStepEditDialogComponent {
     public dialogRef: MatDialogRef<GioPolicyStudioStepEditDialogComponent, GioPolicyStudioStepEditDialogResult>,
     @Inject(MAT_DIALOG_DATA) flowDialogData: GioPolicyStudioStepEditDialogData,
   ) {
-    this.executionPhase = flowDialogData.executionPhase;
+    this.flowPhase = flowDialogData.flowPhase;
     this.genericPolicy = flowDialogData.genericPolicy;
     this.step = flowDialogData.step;
     this.readOnly = Boolean(flowDialogData.readOnly);
diff --git a/projects/ui-policy-studio-angular/src/lib/components/step-edit-dialog/gio-ps-step-edit-dialog.stories.ts b/projects/ui-policy-studio-angular/src/lib/components/step-edit-dialog/gio-ps-step-edit-dialog.stories.ts
index 3242552c3..c96a65a23 100644
--- a/projects/ui-policy-studio-angular/src/lib/components/step-edit-dialog/gio-ps-step-edit-dialog.stories.ts
+++ b/projects/ui-policy-studio-angular/src/lib/components/step-edit-dialog/gio-ps-step-edit-dialog.stories.ts
@@ -102,7 +102,7 @@ export default {
       dialogData: {
         genericPolicy: args.genericPolicy,
         step: args.step,
-        executionPhase: 'REQUEST',
+        flowPhase: 'REQUEST',
       },
     },
   }),
diff --git a/projects/ui-policy-studio-angular/src/lib/components/step-form/gio-ps-step-form.component.ts b/projects/ui-policy-studio-angular/src/lib/components/step-form/gio-ps-step-form.component.ts
index c6126b81d..0a28446ab 100644
--- a/projects/ui-policy-studio-angular/src/lib/components/step-form/gio-ps-step-form.component.ts
+++ b/projects/ui-policy-studio-angular/src/lib/components/step-form/gio-ps-step-form.component.ts
@@ -31,7 +31,7 @@ import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';
 import { GioAsciidoctorModule } from '@gravitee/ui-particles-angular/gio-asciidoctor';
 
-import { ExecutionPhase, isPolicy, isSharedPolicyGroupPolicy, Step, toPolicy, GenericPolicy } from '../../models';
+import { FlowPhase, isPolicy, isSharedPolicyGroupPolicy, Step, toPolicy, GenericPolicy } from '../../models';
 import { GioPolicyStudioService } from '../../policy-studio/gio-policy-studio.service';
 
 @Component({
@@ -58,7 +58,7 @@ export class GioPolicyStudioStepFormComponent implements OnChanges, OnInit, OnDe
   public step?: Step;
 
   @Input({ required: true })
-  public executionPhase!: ExecutionPhase;
+  public flowPhase!: FlowPhase;
 
   @Input()
   public genericPolicy!: GenericPolicy;
@@ -106,11 +106,11 @@ export class GioPolicyStudioStepFormComponent implements OnChanges, OnInit, OnDe
         this.infoBanner = this.genericPolicy.prerequisiteMessage;
       }
     }
-    if (changes.executionPhase) {
+    if (changes.flowPhase) {
       this.context = {
-        executionPhase: this.executionPhase,
+        flowPhase: this.flowPhase,
       };
-      this.isMessage = this.executionPhase === 'MESSAGE_REQUEST' || this.executionPhase === 'MESSAGE_RESPONSE';
+      this.isMessage = this.flowPhase === 'PUBLISH' || this.flowPhase === 'SUBSCRIBE';
     }
   }
 
diff --git a/projects/ui-policy-studio-angular/src/lib/models/ApiProtocolType.ts b/projects/ui-policy-studio-angular/src/lib/models/ApiProtocolType.ts
new file mode 100644
index 000000000..f84d4b001
--- /dev/null
+++ b/projects/ui-policy-studio-angular/src/lib/models/ApiProtocolType.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2023 The Gravitee team (http://gravitee.io)
+ *
+ * Licensed under the Apache License, Version 2.0 (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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export type ApiProtocolType = 'HTTP_MESSAGE' | 'HTTP_PROXY' | 'NATIVE_KAFKA';
diff --git a/projects/ui-policy-studio-angular/src/lib/models/flow/ApiType.ts b/projects/ui-policy-studio-angular/src/lib/models/ApiType.ts
similarity index 91%
rename from projects/ui-policy-studio-angular/src/lib/models/flow/ApiType.ts
rename to projects/ui-policy-studio-angular/src/lib/models/ApiType.ts
index 9508b0bda..efc8496db 100644
--- a/projects/ui-policy-studio-angular/src/lib/models/flow/ApiType.ts
+++ b/projects/ui-policy-studio-angular/src/lib/models/ApiType.ts
@@ -13,4 +13,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export type ApiType = 'MESSAGE' | 'PROXY';
+
+export type ApiType = 'MESSAGE' | 'PROXY' | 'NATIVE';
diff --git a/projects/ui-policy-studio-angular/src/lib/models/flow/index.ts b/projects/ui-policy-studio-angular/src/lib/models/flow/index.ts
index bb7d7cb43..862b04c56 100644
--- a/projects/ui-policy-studio-angular/src/lib/models/flow/index.ts
+++ b/projects/ui-policy-studio-angular/src/lib/models/flow/index.ts
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export * from './ApiType';
 export * from './Flow';
 export * from './FlowExecution';
 export * from './HttpMethod';
diff --git a/projects/ui-policy-studio-angular/src/lib/models/index.ts b/projects/ui-policy-studio-angular/src/lib/models/index.ts
index 1d19188ad..fed17943b 100644
--- a/projects/ui-policy-studio-angular/src/lib/models/index.ts
+++ b/projects/ui-policy-studio-angular/src/lib/models/index.ts
@@ -20,3 +20,5 @@ export * from './policy';
 export * from './ConnectorsInfo';
 export * from './SaveOutput';
 export * from './PolicySchemaFetcher';
+export * from './ApiProtocolType';
+export * from './ApiType';
diff --git a/projects/ui-policy-studio-angular/src/lib/models/policy/Policy.fixture.ts b/projects/ui-policy-studio-angular/src/lib/models/policy/Policy.fixture.ts
index 0e3f0e533..145d05992 100644
--- a/projects/ui-policy-studio-angular/src/lib/models/policy/Policy.fixture.ts
+++ b/projects/ui-policy-studio-angular/src/lib/models/policy/Policy.fixture.ts
@@ -16,7 +16,7 @@
 
 import { isFunction } from 'lodash';
 
-import { Policy } from './Policy';
+import { Policy, PolicyInput } from './Policy';
 
 // 09/06/2023 - All API V4 available policies.
 export const POLICIES_V4_UNREGISTERED_ICON: Policy[] = [
@@ -26,8 +26,10 @@ export const POLICIES_V4_UNREGISTERED_ICON: Policy[] = [
     description: 'Message Filtering Gravitee Policy',
     category: 'others',
     version: '1.1.1',
-    proxy: [],
-    message: ['MESSAGE_RESPONSE', 'MESSAGE_REQUEST'],
+    flowPhaseCompatibility: {
+      HTTP_PROXY: [],
+      HTTP_MESSAGE: ['SUBSCRIBE', 'PUBLISH'],
+    },
   },
   {
     id: 'json-xml',
@@ -36,8 +38,10 @@ export const POLICIES_V4_UNREGISTERED_ICON: Policy[] = [
     icon: 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAuNzEgMTEyLjgyIj48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6Izg2YzNkMDt9LmNscy0ye2ZpbGw6I2ZmZjt9LmNscy0ze2ZvbnQtc2l6ZToxMnB4O2ZpbGw6IzFkMWQxYjtmb250LWZhbWlseTpNeXJpYWRQcm8tUmVndWxhciwgTXlyaWFkIFBybzt9LmNscy00e2xldHRlci1zcGFjaW5nOi0wLjAxZW07fTwvc3R5bGU+PC9kZWZzPjxnIGlkPSJBUEkiPjxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTUwLjM1LDEzLjM3YTQzLDQzLDAsMSwwLDQzLjA1LDQzQTQzLDQzLDAsMCwwLDUwLjM1LDEzLjM3WiIvPjxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTUxLjUsNjQuOTJBNi41Myw2LjUzLDAsMSwxLDU4LDU4LjM5LDYuNTMsNi41MywwLDAsMSw1MS41LDY0LjkyWm0wLTExLjM0YTQuODEsNC44MSwwLDEsMCw0LjgxLDQuODFBNC44MSw0LjgxLDAsMCwwLDUxLjUsNTMuNThaIi8+PHBhdGggY2xhc3M9ImNscy0yIiBkPSJNNjMuOCw3Ny4wOWE0LjgzLDQuODMsMCwxLDEsMy42OS03LjkyLDQuNzQsNC43NCwwLDAsMSwxLjEzLDMuMDlBNC44Myw0LjgzLDAsMCwxLDYzLjgsNzcuMDlabTAtNy45M2EzLjExLDMuMTEsMCwxLDAsMi4zOCwxLjEyQTMuMSwzLjEsMCwwLDAsNjMuOCw2OS4xNloiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik01MS41LDQzLjY4YTQuODUsNC44NSwwLDAsMS00Ljc3LTQuMTQsNSw1LDAsMCwxLDAtLjY5LDQuODMsNC44MywwLDAsMSw5LjY1LDAsMy40NSwzLjQ1LDAsMCwxLS4wNy43NEE0LjgxLDQuODEsMCwwLDEsNTEuNSw0My42OFptMC03LjkzYTMuMSwzLjEsMCwwLDAtMy4xLDMuMSwzLjI1LDMuMjUsMCwwLDAsMCwuNDQsMy4xLDMuMSwwLDAsMCw2LjE0LDAsMi42NiwyLjY2LDAsMCwwLDAtLjQ1QTMuMTEsMy4xMSwwLDAsMCw1MS41LDM1Ljc1WiIvPjxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTMzLjY0LDcwLjE1YTQuODMsNC44MywwLDAsMS0xLjM3LTkuNDYsNSw1LDAsMCwxLDEuMzctLjE5LDQuODIsNC44MiwwLDAsMSw0LjgyLDQuODIsNC44Nyw0Ljg3LDAsMCwxLTIuNzEsNC4zNUE0LjczLDQuNzMsMCwwLDEsMzMuNjQsNzAuMTVabTAtNy45M2EzLDMsMCwwLDAtLjg5LjEzLDMuMSwzLjEsMCwwLDAsLjg5LDYuMDhBMywzLDAsMCwwLDM1LDY4LjEyYTMuMTEsMy4xMSwwLDAsMC0xLjM1LTUuOVoiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0zMi4xOCw1Ni4zNWgtLjEyYS44Ny44NywwLDAsMS0uNzMtMUEyMC40NywyMC40NywwLDAsMSw0Miw0MC4zM2EuODYuODYsMCwxLDEsLjgsMS41MkExOC43NywxOC43NywwLDAsMCwzMyw1NS42MS44Ni44NiwwLDAsMSwzMi4xOCw1Ni4zNVoiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik01MS41LDc4Ljc5YTIwLjE3LDIwLjE3LDAsMCwxLTEyLjI3LTQuMTEuODYuODYsMCwwLDEtLjE3LTEuMjEuODUuODUsMCwwLDEsMS4yLS4xNkExOC41MiwxOC41MiwwLDAsMCw1MS41LDc3LjA3LDE4LjIzLDE4LjIzLDAsMCwwLDU1LDc2LjczYS44Ny44NywwLDAsMSwuMzMsMS43QTIwLjg3LDIwLjg3LDAsMCwxLDUxLjUsNzguNzlaIi8+PHBhdGggY2xhc3M9ImNscy0yIiBkPSJNNzAsNjUuNDJhLjg0Ljg0LDAsMCwxLS4yNywwLC44Ni44NiwwLDAsMS0uNTQtMS4wOSwxOC43MSwxOC43MSwwLDAsMC04LjU1LTIyLjE3Ljg2Ljg2LDAsMSwxLC44NS0xLjUsMjAuNDIsMjAuNDIsMCwwLDEsOS4zMywyNC4yMUEuODcuODcsMCwwLDEsNzAsNjUuNDJaIi8+PC9nPjxnIGlkPSJIT1NUSU5HIj48dGV4dCBjbGFzcz0iY2xzLTMiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDE3LjkzIC00Ljk4KSI+WE1MIDx0c3BhbiBjbGFzcz0iY2xzLTQiIHg9IjI0LjcxIiB5PSIwIj50PC90c3Bhbj48dHNwYW4geD0iMjguNjEiIHk9IjAiPm8gSlNPTjwvdHNwYW4+PC90ZXh0PjwvZz48L3N2Zz4=',
     category: 'transformation',
     version: '2.1.4',
-    proxy: ['REQUEST', 'RESPONSE'],
-    message: ['MESSAGE_RESPONSE', 'MESSAGE_REQUEST'],
+    flowPhaseCompatibility: {
+      HTTP_PROXY: ['REQUEST', 'RESPONSE'],
+      HTTP_MESSAGE: ['SUBSCRIBE', 'PUBLISH'],
+    },
   },
   {
     id: 'avro-json',
@@ -46,8 +50,10 @@ export const POLICIES_V4_UNREGISTERED_ICON: Policy[] = [
     icon: 'data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjUxMnB4IiBoZWlnaHQ9IjUxMnB4Ij48cGF0aCBkPSJNMTcwLjkxNjY3MTgsMzAzLjU3MTYyNDhoLTYuMzQzNDE0M2wzLjY1OTI4NjUtMTUuNDk2MzM3OUwxNzAuOTE2NjcxOCwzMDMuNTcxNjI0OHogTTIxOC44NDU1ODExLDIxMy41OTI4ODAybC0zMy45MTM1NTksMjMuNTE3MjExOWMtMzEuMTk2MDQ0OS0zMC44NDg4NjE3LTgxLjI2NzUzMjMtMy4xMDUzNDY3LTE0NS4yNzcwNjkxLTMxLjk1NDgwMzVDOTMuMzc1MjM2NSwyMTcuOTY2ODQyNywxNjUuMjA1MDE3MSwxOTAuNDQzNjQ5MywyMTguODQ1NTgxMSwyMTMuNTkyODgwMnogTTQxLjUwNzQxMiwyMTYuMjQ4NTA0NmMzMS4zNTk3NTI3LDExLjY5MzY5NTEsNjEuODQwMjc0OCwxNi4xMzY4NDA4LDk0LjIyNzMyNTQsMTQuNjM3MDg1YzMuNTMyOTU5LDEuNTc2MjAyNCw2LjMzODQyNDcsNS4wMjUxMTYsNy45NDYzMDQzLDguMzEwNzc1OEM4My4yODA4MDc1LDI0NS4xMzg1MTkzLDU2LjEwNzQ5ODIsMjI3LjAzOTMzNzIsNDEuNTA3NDEyLDIxNi4yNDg1MDQ2eiBNNTUuMDY1NzczLDIzNS4wMzQ3MTM3YzI4Ljc4NDI0ODQsMTEuMDQ3NTc2OSw1NC44ODU4MDMyLDE3LjU3MjQ3OTIsOTIuMDUzNjQyMywxMS4wNTU2OTQ2YzAsMCw1LjUwOTgxMTQsNC40MzA5OTk4LDUuNjYxNjk3NCw2LjczMzYyNzNDMTAyLjgyODg1NzQsMjYyLjEzMjMyNDIsODMuMzU2MDU2MiwyNTQuMDE2NjkzMSw1NS4wNjU3NzMsMjM1LjAzNDcxMzd6IE0xNTQuNTg0ODU0MSwyNjAuNDQyOTYyNmMtMjcuMDAxNTMzNSwxNC40NTA5Mjc3LTYyLjQ3NzgxMzcsMTAuNTAxMDA3MS03MC42MjIxMDA4LTAuMzQ2MjUyNEMxMTMuMjc0MzQ1NCwyNjUuODk4Mjg0OSwxMzIuNDMzMDEzOSwyNjQuODczMzUyMSwxNTQuNTg0ODU0MSwyNjAuNDQyOTYyNnogTTQ3Mi4zNDUwMzE3LDIwNS4xNTUyODg3Yy02NC4wMDk1MjE1LDI4Ljg0OTQ1NjgtMTE0LjA4MDk5MzcsMS4xMDU5NDE4LTE0NS4yNzcwNjkxLDMxLjk1NDgwMzVsLTMzLjkxMzU0MzctMjMuNTE3MjExOUMzNDYuNzk0OTgyOSwxOTAuNDQzNjQ5Myw0MTguNjI0NzU1OSwyMTcuOTY2ODQyNyw0NzIuMzQ1MDMxNywyMDUuMTU1Mjg4N3ogTTM2OC4zMTg5Njk3LDIzOS4xOTYzNjU0YzEuNjA3ODQ5MS0zLjI4NTY1OTgsNC40MTMzMzAxLTYuNzM0NTczNCw3Ljk0NjI4OTEtOC4zMTA3NzU4YzMyLjM4NzA1NDQsMS40OTk3NTU5LDYyLjg2NzU4NDItMi45NDMzODk5LDk0LjIyNzMyNTQtMTQuNjM3MDg1QzQ1NS44OTI0ODY2LDIyNy4wMzkzMzcyLDQyOC43MTkxNzcyLDI0NS4xMzg1MTkzLDM2OC4zMTg5Njk3LDIzOS4xOTYzNjU0eiBNMzU5LjIxODkwMjYsMjUyLjgyNDAzNTZjMC4xNTE4NTU1LTIuMzAyNjI3Niw1LjY2MTY4MjEtNi43MzM2MjczLDUuNjYxNjgyMS02LjczMzYyNzNjMzcuMTY3ODQ2Nyw2LjUxNjc4NDcsNjMuMjY5NDA5Mi0wLjAwODExNzcsOTIuMDUzNjQ5OS0xMS4wNTU2OTQ2QzQyOC42NDM5NTE0LDI1NC4wMTY2OTMxLDQwOS4xNzExNDI2LDI2Mi4xMzIzMjQyLDM1OS4yMTg5MDI2LDI1Mi44MjQwMzU2eiBNNDI4LjAzNzIzMTQsMjYwLjA5NjcxMDJjLTguMTQ0MjU2NiwxMC44NDcyNTk1LTQzLjYyMDU0NDQsMTQuNzk3MTgwMi03MC42MjIwNzAzLDAuMzQ2MjUyNEMzNzkuNTY2OTg2MSwyNjQuODczMzUyMSwzOTguNzI1NjQ3LDI2NS44OTgyODQ5LDQyOC4wMzcyMzE0LDI2MC4wOTY3MTAyeiBNMTQ3LjIwMDUzMSwzMTguNDk3MjgzOUg5OC41OTU4NjMzbDYwLjEwMzI5NDQtNDAuMjE5MDI0N0wxNDcuMjAwNTMxLDMxOC40OTcyODM5eiBNMTYwLjQxNzU1NjgsMzE4LjY2MDQwMDRsMS4xMjUwNDU4LTQuOTUzMzY5MWgxMS45OTE0MjQ2bDAuOTgxMjE2NCw0Ljk1MzM2OTFIMTYwLjQxNzU1Njh6IE0xODguMzEzODU4LDMxOC43NzAxMTExbC0xNC40NjAwMjItNTAuNTgyNzYzN2wxOS4xNjM4NjQxLTEzLjIzNTI5MDVsMTkuNDQ1MDUzMSw2My44MTgwNTQySDE4OC4zMTM4NTh6IE0yMDQuNjQ3ODI3MSwyNDcuMjI4NDg1MWwzMC40NDY1NDg1LTIwLjYyOTgzN2wtMTYuNDUyNjY3Miw2Ny43NjY3MDg0TDIwNC42NDc4MjcxLDI0Ny4yMjg0ODUxeiBNMjUzLjc1OTAxNzksMzE4LjQ0MTA3MDZoLTI4LjU1NDUxOTdsMjUuMTYzNDIxNi0xMDEuOTY5OTcwN2wzLjM5MTA5OC0xLjg2NDYwODhWMzE4LjQ0MTA3MDZ6IE0yNjUuOTcwNTUwNSwyMzEuMjY5MzYzNGMyNi4xNTI5NTQxLDI0Ljg1Nzk1NTksMjkuMDIxODgxMSwzNi4yNTI5NzU1LDAsMzcuNDExNTc1M1YyMzEuMjY5MzYzNHogTTI2Ni4xMzUwNzA4LDMxOC42NjA0MDA0bDAuMDQ1NzE1My0zMi44NTA0NjM5bDIyLjc2ODY0NjIsMzIuODUwNDYzOUgyNjYuMTM1MDcwOHogTTMwMy4zNTQ2MTQzLDMxOC42NjA0NjE0bC0yNS44ODU0OTgtMzguNTU0MTM4MmMyNC44ODgwOTItNS43ODE1ODU3LDI5LjAzMjE5Ni0yMi4yNjQ4NjIxLDguMDk4Mjk3MS00Ny40MjAxODEzYzE1LjQyODk4NTYsMTAuNzMwODA0NCwzMS4yNjAxMzE4LDIwLjYwMjM3MTIsNDYuNTA2MjI1NiwzMS41NzA4NDY2Yy0yMS40MjgyMjI3LDguMjUxNzctMjguMzY2MDg4OSwzOS40MDI0MzUzLTIuOTI0ODk2Miw1NC40MDM0NzI5SDMwMy4zNTQ2MTQzeiBNMzI3LjU4Mzg2MjMsMjk5LjgyNDY0NmMtOS42NDE4MTUyLTE4Ljc4MDI0MjksMTYuNTM3MjkyNS0zNy4yMzYyNjcxLDIyLjQ3ODAyNzMtMTAuMzk1MDgwNkMzNTIuMDAyNTk0LDMwNS44NzY5MjI2LDMzNS41MjY3NjM5LDMxNS4xODQxNzM2LDMyNy41ODM4NjIzLDI5OS44MjQ2NDZ6IE00MTMuMjAzNjQzOCwzMTguMzg2MjMwNWgtNjcuNjM4NzMyOWMxMy4xMjM4NDAzLTYuMDkzNTk3NCwxOS45MjA3NzY0LTIwLjc5NjE3MzEsMTYuMDMyMTY1NS0zNC43MzM0MjlMNDEzLjIwMzY0MzgsMzE4LjM4NjIzMDV6IE0yMjguODQyMzYxNSwyMDcuNDAzODU0NGMtODIuMjkwMTE1NC0zOC4wNzIwNjczLTE3MC45NzQ3MTYyLDI0LjgzMTgzMjktMjI4LjgxMzU5ODYtMzEuMjg0NzljLTEuMDczMDQ5NywyMC41NTQ5NjIyLDI4LjE1MzU2NDUsMzkuOTczMjIwOCw0MC44NjkyNDc0LDU4LjI4NTQxNTZjNy4yNTAyNDAzLDEzLjEwNTU0NSwyMS43OTM3MzkzLDI1LjE5NTA5ODksMzQuNjYwMzI3OSwzMS4xMzIxMTA2YzguMTc5NjQ5NCwxNC4zNjc5NTA0LDE3LjczMDE4NjUsMTMuMDAwNzAxOSw0NS44NDgxMTQsMTMuNjc0MDExMmwtODMuMTc3MzY4Miw1Ni42NzAzMTg2aDQzNS44ODU5MjUzbC04My41MjE0ODQ0LTU2LjY3MDMxODZjMjguMTE3OTUwNC0wLjY3MzMwOTMsMzcuNjY4NDg3NSwwLjY5MzkzOTIsNDUuODQ4MTE0LTEzLjY3NDAxMTJjMTIuODY2NjA3Ny01LjkzNzAxMTcsMjcuNDEwMDk1Mi0xOC4wMjY1NjU2LDM0LjY2MDMzOTQtMzEuMTMyMTEwNmMxMi43MTU2Njc3LTE4LjMxMjE5NDgsNDEuOTQyMzIxOC0zNy43MzA0NTM1LDQwLjg2OTIzMjItNTguMjg1NDE1NmMtNTcuODM4ODY3Miw1Ni4xMTY2MjI5LTE0Ni40OTc2NTAxLTYuNzg3Mjc3Mi0yMjguNzg3NzgwOCwzMS4yODQ3OWwtMjcuMTc1OTMzOC0xOC4wNzk2NTA5TDIyOC44NDIzNjE1LDIwNy40MDM4NTQ0eiIvPjwvc3ZnPg==',
     category: 'transformation',
     version: '1.2.0-alpha.2',
-    proxy: ['REQUEST', 'RESPONSE'],
-    message: ['MESSAGE_RESPONSE', 'MESSAGE_REQUEST'],
+    flowPhaseCompatibility: {
+      HTTP_PROXY: ['REQUEST', 'RESPONSE'],
+      HTTP_MESSAGE: ['SUBSCRIBE', 'PUBLISH'],
+    },
   },
   {
     id: 'jwt',
@@ -56,8 +62,10 @@ export const POLICIES_V4_UNREGISTERED_ICON: Policy[] = [
     icon: 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAuNzEgMTEyLjgyIj48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6Izg2YzNkMDt9LmNscy0ye2ZpbGw6I2ZmZjt9LmNscy0ze2ZvbnQtc2l6ZToxMnB4O2ZpbGw6IzFkMWQxYjtmb250LWZhbWlseTpNeXJpYWRQcm8tUmVndWxhciwgTXlyaWFkIFBybzt9LmNscy00e2xldHRlci1zcGFjaW5nOjAuMDNlbTt9PC9zdHlsZT48L2RlZnM+PGcgaWQ9IkFQSSI+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNNTAuMzUsMTMuMzdhNDMsNDMsMCwxLDAsNDMuMDUsNDNBNDMsNDMsMCwwLDAsNTAuMzUsMTMuMzdaIi8+PHBhdGggY2xhc3M9ImNscy0yIiBkPSJNNDEuNzksNjEuNjdhMTMuODIsMTMuODIsMCwxLDEsMTIuNTctOCwuODcuODcsMCwwLDEtMS4xNS40Mi44Ni44NiwwLDAsMS0uNDItMS4xNCwxMi4xMiwxMi4xMiwwLDEsMC0yLjQ0LDMuNDkuODYuODYsMCwxLDEsMS4yMiwxLjIyQTEzLjgsMTMuOCwwLDAsMSw0MS43OSw2MS42N1oiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik02OC4zMSw3OC44YTQuNCw0LjQsMCwwLDEtMy4xNC0xLjNMNTUuNiw2Ny45M2EuODYuODYsMCwxLDEsMS4yMi0xLjIybDkuNTcsOS41N2EyLjc3LDIuNzcsMCwwLDAsMy44NCwwLDIuNzIsMi43MiwwLDAsMCwwLTMuODNsLTkuNTctOS41OGEyLjc5LDIuNzksMCwwLDAtMy44NCwwLC44OC44OCwwLDAsMS0xLjIyLDBsLTUuMjUtNS4yNGEuODguODgsMCwwLDEsMC0xLjIyLjg2Ljg2LDAsMCwxLDEuMjIsMGw0LjcsNC43YTQuNDMsNC40MywwLDAsMSw1LjYuNTVsOS41OCw5LjU3YTQuNDQsNC40NCwwLDAsMS0zLjE0LDcuNTdaIi8+PHBhdGggY2xhc3M9ImNscy0yIiBkPSJNNDYuMzYsNTMuMjdhLjg1Ljg1LDAsMCwxLS42MS0uMjVsLTkuMTQtOS4xM2EuODguODgsMCwwLDEsMC0xLjIyLjg2Ljg2LDAsMCwxLDEuMjIsMEw0Nyw1MS44QS44OC44OCwwLDAsMSw0Nyw1MywuODUuODUsMCwwLDEsNDYuMzYsNTMuMjdaIi8+PHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMzcuMjIsNTMuMjdhLjg1Ljg1LDAsMCwxLS42MS0uMjUuODguODgsMCwwLDEsMC0xLjIybDkuMTQtOS4xM2EuODYuODYsMCwwLDEsMS4yMiwwLC44OC44OCwwLDAsMSwwLDEuMjJMMzcuODMsNTNBLjg1Ljg1LDAsMCwxLDM3LjIyLDUzLjI3WiIvPjwvZz48ZyBpZD0iSE9TVElORyI+PHRleHQgY2xhc3M9ImNscy0zIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxNy45MyAtNC45OCkiPko8dHNwYW4gY2xhc3M9ImNscy00IiB4PSI0LjQ0IiB5PSIwIj5XPC90c3Bhbj48dHNwYW4geD0iMTQuOTkiIHk9IjAiPlQ8L3RzcGFuPjwvdGV4dD48L2c+PC9zdmc+',
     category: 'security',
     version: '3.2.0',
-    proxy: ['REQUEST'],
-    message: ['REQUEST'],
+    flowPhaseCompatibility: {
+      HTTP_PROXY: ['REQUEST'],
+      HTTP_MESSAGE: ['REQUEST'],
+    },
   },
   {
     id: 'key-less',
@@ -66,8 +74,10 @@ export const POLICIES_V4_UNREGISTERED_ICON: Policy[] = [
     icon: 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAuNzEgMTEyLjgyIj48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6Izg2YzNkMDt9LmNscy0ye2ZpbGw6I2ZmZjt9LmNscy0ze2ZpbGw6bm9uZTtzdHJva2U6I2ZmZjtzdHJva2UtbWl0ZXJsaW1pdDoxMDtzdHJva2Utd2lkdGg6MnB4O308L3N0eWxlPjwvZGVmcz48ZyBpZD0iQVBJIj48cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik01MC4zNSwxNC4yNGE0Myw0MywwLDEsMCw0My4wNSw0M0E0Myw0MywwLDAsMCw1MC4zNSwxNC4yNFoiLz48L2c+PGcgaWQ9IkhPU1RJTkciPjxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTU3LjU2LDg4LjYzSDQzLjE1YTIuOSwyLjksMCwwLDEtMi45LTIuOVY3Ni42MmEyLjg5LDIuODksMCwwLDEsMi45LTIuODlINTcuNTZhMi44OSwyLjg5LDAsMCwxLDIuOSwyLjg5djkuMTFBMi45LDIuOSwwLDAsMSw1Ny41Niw4OC42M1pNNDMuMTUsNzYuMTRhLjQ4LjQ4LDAsMCwwLS40OS40OHY5LjExYS40OS40OSwwLDAsMCwuNDkuNDlINTcuNTZhLjQ5LjQ5LDAsMCwwLC40OS0uNDlWNzYuNjJhLjQ4LjQ4LDAsMCwwLS40OS0uNDhaIi8+PHBhdGggY2xhc3M9ImNscy0yIiBkPSJNNTAuMzUsNjMuNjJBNy41OCw3LjU4LDAsMCwwLDQyLjg5LDcwaDIuNDdhNS4xNSw1LjE1LDAsMCwxLDEwLjE1LDEuMjN2My43NGExLjIxLDEuMjEsMCwxLDAsMi40MSwwVjcxLjE5QTcuNTgsNy41OCwwLDAsMCw1MC4zNSw2My42MloiLz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yNi4xNiw0Ny40M2EyNS4yMiwyNS4yMiwwLDAsMSw0OC4zOS0uMzEiLz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0zMi4xMiw1Mi44YTE5LDE5LDAsMCwxLDM2LjQ3LS4yMyIvPjxwYXRoIGNsYXNzPSJjbHMtMyIgZD0iTTM5LjM0LDU2LjY1YTExLDExLDAsMCwxLDIxLjE3LS4xNCIvPjwvZz48L3N2Zz4=',
     category: 'security',
     version: '2.2.0',
-    proxy: ['REQUEST'],
-    message: ['REQUEST'],
+    flowPhaseCompatibility: {
+      HTTP_PROXY: ['REQUEST'],
+      HTTP_MESSAGE: ['REQUEST'],
+    },
   },
   {
     id: 'api-key',
@@ -76,8 +86,10 @@ export const POLICIES_V4_UNREGISTERED_ICON: Policy[] = [
     icon: 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAuNzEgMTEyLjgyIj48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6Izg2YzNkMDt9LmNscy0ye2ZpbGw6I2ZmZjt9LmNscy0ze2ZvbnQtc2l6ZToxMnB4O2ZpbGw6IzFkMWQxYjtmb250LWZhbWlseTpNeXJpYWRQcm8tUmVndWxhciwgTXlyaWFkIFBybzt9LmNscy00e2xldHRlci1zcGFjaW5nOjBlbTt9PC9zdHlsZT48L2RlZnM+PGcgaWQ9IkFQSSI+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNNTAuMzUsMTMuMzdhNDMsNDMsMCwxLDAsNDMuMDUsNDNBNDMsNDMsMCwwLDAsNTAuMzUsMTMuMzdaIi8+PHBhdGggY2xhc3M9ImNscy0yIiBkPSJNNjcuMzMsNzguNjVIMzkuNzhBMi42MSwyLjYxLDAsMCwxLDM3LjE3LDc2VjcxLjg4YS44NC44NCwwLDAsMSwuMzYtLjcsNy4wNiw3LjA2LDAsMCwwLDItMi4yMS44NS44NSwwLDAsMSwuNzUtLjQzSDQyLjZMNDUsNjYuNzlhLjg2Ljg2LDAsMCwxLDEtLjA1bDIuNzIsMS42NCwyLjUzLTEuNjJhLjg2Ljg2LDAsMCwxLDEsMGwuNDkuMzhWNjIuNDZINDAuMjhhLjg2Ljg2LDAsMCwxLS43NS0uNDQsNi43Niw2Ljc2LDAsMCwwLTItMi4xOS44OC44OCwwLDAsMS0uMzYtLjcxVjU1YTIuNjIsMi42MiwwLDAsMSwyLjYxLTIuNjJINjcuMzNBMi42MywyLjYzLDAsMCwxLDcwLDU1Vjc2QTIuNjIsMi42MiwwLDAsMSw2Ny4zMyw3OC42NVpNMzguOSw3Mi4zMlY3NmEuODkuODksMCwwLDAsLjg4Ljg4SDY3LjMzYS44Ny44NywwLDAsMCwuODgtLjg4VjU1YS44OC44OCwwLDAsMC0uODgtLjg4SDM5Ljc4YS44OS44OSwwLDAsMC0uODguODh2My43MmE4LjYyLDguNjIsMCwwLDEsMS44NywySDUzLjU1YS44Ny44NywwLDAsMSwuODcuODdWNjlhLjg3Ljg3LDAsMCwxLS40OS43OC44Ni44NiwwLDAsMS0uOTEtLjFsLTEuNDEtMS4xMS0yLjQ2LDEuNTlhLjg3Ljg3LDAsMCwxLS45MiwwbC0yLjY5LTEuNjJMNDMuNCw3MC4xMWEuOTQuOTQsMCwwLDEtLjUyLjE2SDQwLjc3QTguNjksOC42OSwwLDAsMSwzOC45LDcyLjMyWiIvPjxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTY1Ljg0LDU0LjA4SDYxLjQ3YS44Ny44NywwLDAsMS0uODctLjg3di01LjlhNyw3LDAsMCwwLTE0LjA4LDB2NS45YS44Ny44NywwLDAsMS0uODcuODdINDEuMjhhLjg3Ljg3LDAsMCwxLS44Ny0uODd2LTUuOWExMy4xNSwxMy4xNSwwLDEsMSwyNi4zLDB2NS45QS44Ny44NywwLDAsMSw2NS44NCw1NC4wOFptLTMuNS0xLjc0SDY1di01YTExLjQxLDExLjQxLDAsMSwwLTIyLjgyLDB2NWgyLjYzdi01YTguNzgsOC43OCwwLDAsMSwxNy41NiwwWiIvPjxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTMxLjcxLDY5YTMuNTEsMy41MSwwLDEsMSwzLjUxLTMuNTFBMy41MSwzLjUxLDAsMCwxLDMxLjcxLDY5Wm0wLTUuMjlhMS43OCwxLjc4LDAsMSwwLDEuNzcsMS43OEExLjc4LDEuNzgsMCwwLDAsMzEuNzEsNjMuNzJaIi8+PHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMzMuNDgsNzQuMjJhOC43Miw4LjcyLDAsMSwxLDUuMDYtMTUuODEsOC41OSw4LjU5LDAsMCwxLDIuMjMsMi4zMUg1My41NWEuODcuODcsMCwwLDEsLjg3Ljg3VjY5YS44Ny44NywwLDAsMS0uNDkuNzguODYuODYsMCwwLDEtLjkxLS4xbC0xLjQxLTEuMTEtMi40NiwxLjU5YS44Ny44NywwLDAsMS0uOTIsMGwtMi42OS0xLjYyTDQzLjQsNzAuMTFhLjk0Ljk0LDAsMCwxLS41Mi4xNkg0MC43N2E4Ljc1LDguNzUsMCwwLDEtNy4yOSw0Wm0wLTE1LjY5YTcsNywwLDEsMCw0LjA1LDEyLjY1LDcuMDYsNy4wNiwwLDAsMCwyLTIuMjEuODUuODUsMCwwLDEsLjc1LS40M0g0Mi42TDQ1LDY2Ljc5YS44Ni44NiwwLDAsMSwxLS4wNWwyLjcyLDEuNjQsMi41My0xLjYyYS44Ni44NiwwLDAsMSwxLDBsLjQ5LjM4VjYyLjQ2SDQwLjI4YS44Ni44NiwwLDAsMS0uNzUtLjQ0LDYuNzYsNi43NiwwLDAsMC0yLTIuMTlBNi45Myw2LjkzLDAsMCwwLDMzLjQ4LDU4LjUzWk0zMS43MSw2OWEzLjUxLDMuNTEsMCwxLDEsMy41MS0zLjUxQTMuNTEsMy41MSwwLDAsMSwzMS43MSw2OVptMC01LjI5YTEuNzgsMS43OCwwLDEsMCwxLjc3LDEuNzhBMS43OCwxLjc4LDAsMCwwLDMxLjcxLDYzLjcyWiIvPjxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTMxLjcxLDY5YTMuNTEsMy41MSwwLDEsMSwzLjUxLTMuNTFBMy41MSwzLjUxLDAsMCwxLDMxLjcxLDY5Wm0wLTUuMjlhMS43OCwxLjc4LDAsMSwwLDEuNzcsMS43OEExLjc4LDEuNzgsMCwwLDAsMzEuNzEsNjMuNzJaIi8+PHBhdGggY2xhc3M9ImNscy0yIiBkPSJNNTMuNTYsNzMuNjlhLjg3Ljg3LDAsMCwxLS44Ny0uODdWNjlhLjg3Ljg3LDAsMCwxLDEuNzQsMHYzLjg1QS44Ny44NywwLDAsMSw1My41Niw3My42OVoiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik01My41Niw2Mi4zN2EuODcuODcsMCwwLDEtLjg3LS44N1Y1Ny42NWEuODcuODcsMCwwLDEsMS43NCwwVjYxLjVBLjg3Ljg3LDAsMCwxLDUzLjU2LDYyLjM3WiIvPjwvZz48ZyBpZD0iSE9TVElORyI+PHRleHQgY2xhc3M9ImNscy0zIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxNy45MyAtNC45OCkiPjx0c3BhbiBjbGFzcz0iY2xzLTQiPkE8L3RzcGFuPjx0c3BhbiB4PSI3LjMxIiB5PSIwIj5waSBLZXk8L3RzcGFuPjwvdGV4dD48L2c+PC9zdmc+',
     category: 'security',
     version: '3.2.1',
-    proxy: ['REQUEST'],
-    message: ['REQUEST'],
+    flowPhaseCompatibility: {
+      HTTP_PROXY: ['REQUEST'],
+      HTTP_MESSAGE: ['REQUEST'],
+    },
   },
   {
     id: 'oauth2',
@@ -86,8 +98,10 @@ export const POLICIES_V4_UNREGISTERED_ICON: Policy[] = [
     icon: 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAuNzEgMTEyLjgyIj48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6Izg2YzNkMDt9LmNscy0ye2ZpbGw6I2ZmZjt9LmNscy0ze2ZvbnQtc2l6ZToxMnB4O2ZpbGw6IzFkMWQxYjtmb250LWZhbWlseTpNeXJpYWRQcm8tUmVndWxhciwgTXlyaWFkIFBybzt9LmNscy00e2xldHRlci1zcGFjaW5nOi0wLjAxZW07fS5jbHMtNXtsZXR0ZXItc3BhY2luZzowLjAxZW07fS5jbHMtNntsZXR0ZXItc3BhY2luZzowZW07fS5jbHMtN3tsZXR0ZXItc3BhY2luZzotMC4wMWVtO30uY2xzLTh7bGV0dGVyLXNwYWNpbmc6MC4wMWVtO30uY2xzLTl7bGV0dGVyLXNwYWNpbmc6LTAuMDFlbTt9LmNscy0xMHtsZXR0ZXItc3BhY2luZzotMC4wMWVtO30uY2xzLTExe2xldHRlci1zcGFjaW5nOi0wLjAxZW07fTwvc3R5bGU+PC9kZWZzPjxnIGlkPSJBUEkiPjxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTUwLjM1LDEzLjM3YTQzLDQzLDAsMSwwLDQzLjA1LDQzQTQzLDQzLDAsMCwwLDUwLjM1LDEzLjM3WiIvPjxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTUwLjE5LDMzLjc1YzUuOCwwLDYuNTUuNTMsOC4zNiw2UTYzLjg5LDU1Ljg4LDY5LjIxLDcyYy45MywyLjgxLjA3LDUuMjUtMi4wOCw2LjM4LTIuODgsMS41MS01Ljg3LjMxLTcuMDgtMi45NC0uNzktMi4xMi0xLjMxLTQuMzUtMi4yMy02LjQxYTMuMjksMy4yOSwwLDAsMC0yLjI0LTEuNzcsOTIuMyw5Mi4zLDAsMCwwLTEwLjUyLDAsMy4yNywzLjI3LDAsMCwwLTIuMTksMS44Yy0uODUsMi0xLjMyLDQuMTMtMiw2LjE4LTEuMDYsMy0zLjQ3LDQuMzItNi4xNywzLjQ5LTIuODctLjg4LTQuMTktMy4zNy0zLjIyLTYuNXE1LTE2LjExLDEwLjEyLTMyLjE3QzQzLjQsMzQuMjcsNDQuMTIsMzMuNzUsNTAuMTksMzMuNzVaIi8+PC9nPjxnIGlkPSJIT1NUSU5HIj48dGV4dCBjbGFzcz0iY2xzLTMiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDkyLjQ1IC00Ljk4KSI+T3BlbklEIDx0c3BhbiBjbGFzcz0iY2xzLTQiIHg9IjQxLjE3IiB5PSIwIj5DPC90c3Bhbj48dHNwYW4geD0iNDgiIHk9IjAiPm9ubmU8L3RzcGFuPjx0c3BhbiBjbGFzcz0iY2xzLTUiIHg9IjczLjkyIiB5PSIwIj5jPC90c3Bhbj48dHNwYW4gY2xhc3M9ImNscy02IiB4PSI3OS40NSIgeT0iMCI+dCAtIDwvdHNwYW4+PHRzcGFuIGNsYXNzPSJjbHMtNyIgeD0iOTIuMTkiIHk9IjAiPlU8L3RzcGFuPjx0c3BhbiB4PSI5OS44OSIgeT0iMCI+c2VyPC90c3Bhbj48dHNwYW4gY2xhc3M9ImNscy04IiB4PSIxMTQuNTciIHk9IjAiPkk8L3RzcGFuPjx0c3BhbiB4PSIxMTcuNTYiIHk9IjAiPm48L3RzcGFuPjx0c3BhbiBjbGFzcz0iY2xzLTkiIHg9IjEyNC4yMiIgeT0iMCI+ZjwvdHNwYW4+PHRzcGFuIHg9IjEyNy41NyIgeT0iMCI+bzwvdHNwYW4+PC90ZXh0Pjx0ZXh0IGNsYXNzPSJjbHMtMyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMTcuOTMgLTQuOTgpIj48dHNwYW4gY2xhc3M9ImNscy0xMCI+TzwvdHNwYW4+PHRzcGFuIGNsYXNzPSJjbHMtMTEiIHg9IjguMSIgeT0iMCI+QTwvdHNwYW4+PHRzcGFuIHg9IjE1LjMiIHk9IjAiPnV0aDI8L3RzcGFuPjwvdGV4dD48L2c+PC9zdmc+',
     category: 'security',
     version: '2.2.0',
-    proxy: ['REQUEST'],
-    message: ['REQUEST'],
+    flowPhaseCompatibility: {
+      HTTP_PROXY: ['REQUEST'],
+      HTTP_MESSAGE: ['REQUEST'],
+    },
   },
   {
     id: 'json-to-json',
@@ -96,8 +110,10 @@ export const POLICIES_V4_UNREGISTERED_ICON: Policy[] = [
     icon: 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAuNzEgMTEyLjgyIj48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6Izg2YzNkMDt9LmNscy0ye2ZpbGw6I2ZmZjt9LmNscy0ze2ZvbnQtc2l6ZToxMnB4O2ZpbGw6IzFkMWQxYjtmb250LWZhbWlseTpNeXJpYWRQcm8tUmVndWxhciwgTXlyaWFkIFBybzt9LmNscy00e2xldHRlci1zcGFjaW5nOi0wLjAxZW07fTwvc3R5bGU+PC9kZWZzPjxnIGlkPSJBUEkiPjxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTUwLjM1LDEzLjM3YTQzLDQzLDAsMSwwLDQzLjA1LDQzQTQzLDQzLDAsMCwwLDUwLjM1LDEzLjM3WiIvPjxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTYzLjgsNzcuMDlhNC44Myw0LjgzLDAsMSwxLDMuNjktNy45Miw0Ljc0LDQuNzQsMCwwLDEsMS4xMywzLjA5QTQuODMsNC44MywwLDAsMSw2My44LDc3LjA5Wm0wLTcuOTNhMy4xMSwzLjExLDAsMSwwLDIuMzgsMS4xMkEzLjEsMy4xLDAsMCwwLDYzLjgsNjkuMTZaIi8+PHBhdGggY2xhc3M9ImNscy0yIiBkPSJNNTEuNSw0My42OGE0Ljg1LDQuODUsMCwwLDEtNC43Ny00LjE0LDUsNSwwLDAsMSwwLS42OSw0LjgzLDQuODMsMCwwLDEsOS42NSwwLDMuNDUsMy40NSwwLDAsMS0uMDcuNzRBNC44MSw0LjgxLDAsMCwxLDUxLjUsNDMuNjhabTAtNy45M2EzLjEsMy4xLDAsMCwwLTMuMSwzLjEsMy4yNSwzLjI1LDAsMCwwLDAsLjQ0LDMuMSwzLjEsMCwwLDAsNi4xNCwwLDIuNjYsMi42NiwwLDAsMCwwLS40NUEzLjExLDMuMTEsMCwwLDAsNTEuNSwzNS43NVoiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0zMy42NCw3MC4xNWE0LjgzLDQuODMsMCwwLDEtMS4zNy05LjQ2LDUsNSwwLDAsMSwxLjM3LS4xOSw0LjgyLDQuODIsMCwwLDEsNC44Miw0LjgyLDQuODcsNC44NywwLDAsMS0yLjcxLDQuMzVBNC43Myw0LjczLDAsMCwxLDMzLjY0LDcwLjE1Wm0wLTcuOTNhMywzLDAsMCwwLS44OS4xMywzLjEsMy4xLDAsMCwwLC44OSw2LjA4QTMsMywwLDAsMCwzNSw2OC4xMmEzLjExLDMuMTEsMCwwLDAtMS4zNS01LjlaIi8+PHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMzIuMTgsNTYuMzVoLS4xMmEuODcuODcsMCwwLDEtLjczLTFBMjAuNDcsMjAuNDcsMCwwLDEsNDIsNDAuMzNhLjg2Ljg2LDAsMSwxLC44LDEuNTJBMTguNzcsMTguNzcsMCwwLDAsMzMsNTUuNjEuODYuODYsMCwwLDEsMzIuMTgsNTYuMzVaIi8+PHBhdGggY2xhc3M9ImNscy0yIiBkPSJNNTEuNSw3OC43OWEyMC4xNywyMC4xNywwLDAsMS0xMi4yNy00LjExLjg2Ljg2LDAsMCwxLS4xNy0xLjIxLjg1Ljg1LDAsMCwxLDEuMi0uMTZBMTguNTIsMTguNTIsMCwwLDAsNTEuNSw3Ny4wNywxOC4yMywxOC4yMywwLDAsMCw1NSw3Ni43M2EuODcuODcsMCwwLDEsLjMzLDEuN0EyMC44NywyMC44NywwLDAsMSw1MS41LDc4Ljc5WiIvPjxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTcwLDY1LjQyYS44NC44NCwwLDAsMS0uMjcsMCwuODYuODYsMCwwLDEtLjU0LTEuMDksMTguNzEsMTguNzEsMCwwLDAtOC41NS0yMi4xNy44Ni44NiwwLDEsMSwuODUtMS41LDIwLjQyLDIwLjQyLDAsMCwxLDkuMzMsMjQuMjFBLjg3Ljg3LDAsMCwxLDcwLDY1LjQyWiIvPjwvZz48ZyBpZD0iSE9TVElORyI+PHRleHQgY2xhc3M9ImNscy0zIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxNy45MyAtNC45OCkiPkpTT04gPHRzcGFuIGNsYXNzPSJjbHMtNCIgeD0iMjkuMDYiIHk9IjAiPnQ8L3RzcGFuPjx0c3BhbiB4PSIzMi45NiIgeT0iMCI+byBKU09OPC90c3Bhbj48L3RleHQ+PC9nPjwvc3ZnPg==',
     category: 'transformation',
     version: '2.1.0',
-    proxy: ['REQUEST', 'RESPONSE'],
-    message: ['MESSAGE_RESPONSE', 'MESSAGE_REQUEST'],
+    flowPhaseCompatibility: {
+      HTTP_PROXY: ['REQUEST', 'RESPONSE'],
+      HTTP_MESSAGE: ['SUBSCRIBE', 'PUBLISH'],
+    },
   },
   {
     id: 'transform-headers',
@@ -107,8 +123,10 @@ export const POLICIES_V4_UNREGISTERED_ICON: Policy[] = [
     category: 'transformation',
     version: '2.1.0-alpha.2',
     deployed: true,
-    proxy: ['REQUEST', 'RESPONSE'],
-    message: ['MESSAGE_RESPONSE', 'REQUEST', 'MESSAGE_REQUEST', 'RESPONSE'],
+    flowPhaseCompatibility: {
+      HTTP_PROXY: ['REQUEST', 'RESPONSE'],
+      HTTP_MESSAGE: ['REQUEST', 'RESPONSE', 'SUBSCRIBE', 'PUBLISH'],
+    },
   },
 ];
 
@@ -117,8 +135,10 @@ export function fakeTestPolicy(modifier?: Partial<Policy> | ((base: Policy) => P
     id: 'test-policy',
     name: 'Policy to test UI',
     icon: 'gio:gift',
-    proxy: ['REQUEST', 'RESPONSE'],
-    message: ['REQUEST', 'RESPONSE', 'MESSAGE_RESPONSE', 'MESSAGE_REQUEST'],
+    flowPhaseCompatibility: {
+      HTTP_PROXY: ['REQUEST', 'RESPONSE'],
+      HTTP_MESSAGE: ['REQUEST', 'RESPONSE', 'SUBSCRIBE', 'PUBLISH'],
+    },
   };
 
   if (isFunction(modifier)) {
@@ -128,10 +148,25 @@ export function fakeTestPolicy(modifier?: Partial<Policy> | ((base: Policy) => P
   return {
     ...base,
     ...modifier,
+    flowPhaseCompatibility: {
+      ...base.flowPhaseCompatibility,
+      ...modifier?.flowPhaseCompatibility,
+    },
   };
 }
 
-export function fakeAllPolicies(): Policy[] {
+export function fakeAllPolicies(): (PolicyInput | Policy)[] {
+  /**
+   * @Deprecated to keep as long as we support APIM < 4.6
+   */
+  const TEST_POLICY_APIM_4_5: PolicyInput = {
+    id: 'test-policy-4.5',
+    name: 'Policy to test APIM < 4.6',
+    icon: undefined,
+    proxy: ['REQUEST', 'RESPONSE'],
+    message: ['REQUEST', 'RESPONSE', 'MESSAGE_REQUEST', 'MESSAGE_RESPONSE'],
+  };
+
   return [
     fakeTestPolicy(),
     fakeTestPolicy({
@@ -153,8 +188,11 @@ export function fakeAllPolicies(): Policy[] {
       id: 'transformation-policy',
       name: 'transformation policy',
       category: 'transformation',
-      proxy: ['REQUEST'],
+      flowPhaseCompatibility: {
+        HTTP_PROXY: ['REQUEST'],
+      },
     }),
+    TEST_POLICY_APIM_4_5,
     ...POLICIES_V4_UNREGISTERED_ICON.map(policy => ({
       ...policy,
       // Replace all icons with the policy id. Icons are registred in the IconRegistry before.
diff --git a/projects/ui-policy-studio-angular/src/lib/models/policy/Policy.ts b/projects/ui-policy-studio-angular/src/lib/models/policy/Policy.ts
index b9809731b..b5ae55045 100644
--- a/projects/ui-policy-studio-angular/src/lib/models/policy/Policy.ts
+++ b/projects/ui-policy-studio-angular/src/lib/models/policy/Policy.ts
@@ -13,7 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export type ExecutionPhase = 'REQUEST' | 'RESPONSE' | 'MESSAGE_REQUEST' | 'MESSAGE_RESPONSE';
+
+import { get } from 'lodash';
+
+import { ApiProtocolType } from '../ApiProtocolType';
+
+export type FlowPhase = 'REQUEST' | 'RESPONSE' | 'INTERACT' | 'CONNECT' | 'PUBLISH' | 'SUBSCRIBE';
 
 export interface Policy {
   id: string;
@@ -22,7 +27,46 @@ export interface Policy {
   description?: string;
   category?: string;
   version?: string;
-  proxy?: ExecutionPhase[];
-  message?: ExecutionPhase[];
+  flowPhaseCompatibility?: Partial<Record<ApiProtocolType, FlowPhase[]>>;
   deployed?: boolean;
 }
+
+/**
+ * @Deprecated to keep as long as we support APIM < 4.6
+ */
+export type ExecutionPhase = 'REQUEST' | 'RESPONSE' | 'MESSAGE_REQUEST' | 'MESSAGE_RESPONSE';
+
+export type PolicyInput = Omit<Policy, 'proxy' | 'message'> & {
+  proxy?: ExecutionPhase[];
+  message?: ExecutionPhase[];
+};
+
+/**
+ * @Deprecated to keep as long as we support APIM < 4.6
+ */
+export const fromPolicyInput = (policy: PolicyInput | Policy): Policy => {
+  const getProxyPhase = get(policy, 'proxy')?.map(fromExecutionPhase);
+  const getMessagePhase = get(policy, 'message')?.map(fromExecutionPhase);
+
+  return {
+    ...policy,
+    flowPhaseCompatibility: {
+      ...(getProxyPhase && { HTTP_PROXY: getProxyPhase }),
+      ...(getMessagePhase && { HTTP_MESSAGE: getMessagePhase }),
+      ...policy.flowPhaseCompatibility,
+    },
+  };
+};
+
+/**
+ * @Deprecated to keep as long as we support APIM < 4.6
+ */
+export const fromExecutionPhase = (phase: ExecutionPhase | FlowPhase): FlowPhase => {
+  if (phase === 'MESSAGE_REQUEST') {
+    return 'PUBLISH';
+  }
+  if (phase === 'MESSAGE_RESPONSE') {
+    return 'SUBSCRIBE';
+  }
+  return phase;
+};
diff --git a/projects/ui-policy-studio-angular/src/lib/models/policy/SharedPolicyGroupPolicy.fixture.ts b/projects/ui-policy-studio-angular/src/lib/models/policy/SharedPolicyGroupPolicy.fixture.ts
index 83b53e951..8eea8f333 100644
--- a/projects/ui-policy-studio-angular/src/lib/models/policy/SharedPolicyGroupPolicy.fixture.ts
+++ b/projects/ui-policy-studio-angular/src/lib/models/policy/SharedPolicyGroupPolicy.fixture.ts
@@ -75,9 +75,9 @@ export function fakeAllSharedPolicyGroupPolicies(): SharedPolicyGroupPolicy[] {
     fakeProxyRequestSharedPolicyGroupPolicy({
       id: '4d4c1b3b-3b1b-4b3b-8b3b-1b3b4c1b3b4e',
       name: 'Test SPG MESSAGE 4',
-      description: 'MESSAGE_REQUEST Phase',
+      description: 'PUBLISH Phase',
       apiType: 'MESSAGE',
-      phase: 'MESSAGE_REQUEST',
+      phase: 'PUBLISH',
     }),
   ];
 }
diff --git a/projects/ui-policy-studio-angular/src/lib/models/policy/SharedPolicyGroupPolicy.ts b/projects/ui-policy-studio-angular/src/lib/models/policy/SharedPolicyGroupPolicy.ts
index b32b0fa26..bc12e80c4 100644
--- a/projects/ui-policy-studio-angular/src/lib/models/policy/SharedPolicyGroupPolicy.ts
+++ b/projects/ui-policy-studio-angular/src/lib/models/policy/SharedPolicyGroupPolicy.ts
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import { ApiType } from '../flow';
+import { ApiType } from '../ApiType';
 
-import { ExecutionPhase } from './Policy';
+import { FlowPhase } from './Policy';
 
 export type SharedPolicyGroupPolicy = {
   id: string;
@@ -25,5 +25,5 @@ export type SharedPolicyGroupPolicy = {
   description?: string;
   prerequisiteMessage?: string;
   apiType: ApiType;
-  phase: ExecutionPhase;
+  phase: FlowPhase;
 };
diff --git a/projects/ui-policy-studio-angular/src/lib/policy-group-studio/gio-policy-group-studio.component.html b/projects/ui-policy-studio-angular/src/lib/policy-group-studio/gio-policy-group-studio.component.html
index 261faa839..352976f10 100644
--- a/projects/ui-policy-studio-angular/src/lib/policy-group-studio/gio-policy-group-studio.component.html
+++ b/projects/ui-policy-studio-angular/src/lib/policy-group-studio/gio-policy-group-studio.component.html
@@ -27,7 +27,7 @@
     [apiType]="apiType"
     [genericPolicies]="genericPolicies"
     [trialUrl]="trialUrl"
-    [policyExecutionPhase]="executionPhase"
+    [policyFlowPhase]="flowPhase"
     (stepsChange)="onStepsChange($event)"
   ></gio-ps-flow-details-phase>
 } @else {
diff --git a/projects/ui-policy-studio-angular/src/lib/policy-group-studio/gio-policy-group-studio.component.spec.ts b/projects/ui-policy-studio-angular/src/lib/policy-group-studio/gio-policy-group-studio.component.spec.ts
index acf525a8f..102d04d72 100644
--- a/projects/ui-policy-studio-angular/src/lib/policy-group-studio/gio-policy-group-studio.component.spec.ts
+++ b/projects/ui-policy-studio-angular/src/lib/policy-group-studio/gio-policy-group-studio.component.spec.ts
@@ -24,7 +24,7 @@ import { MatInputHarness } from '@angular/material/input/testing';
 
 import { fakePolicySchema } from '../models/policy/PolicySchema.fixture';
 import { fakeAllPolicies, fakeTestPolicy } from '../models/policy/Policy.fixture';
-import { ApiType, ExecutionPhase } from '../models';
+import { ApiType, ExecutionPhase, FlowPhase } from '../models';
 
 import { GioPolicyGroupStudioHarness } from './gio-policy-group-studio.harness';
 import { PolicyGroupOutput, GioPolicyGroupStudioComponent } from './gio-policy-group-studio.component';
@@ -40,7 +40,7 @@ describe('GioPolicyGroupStudioComponent', () => {
     }).compileComponents();
   });
 
-  async function initComponent(apiType: ApiType, executionPhase: ExecutionPhase) {
+  async function initComponent(apiType: ApiType, flowPhase: FlowPhase) {
     fixture = TestBed.createComponent(GioPolicyGroupStudioComponent);
     component = fixture.componentInstance;
 
@@ -48,7 +48,7 @@ describe('GioPolicyGroupStudioComponent', () => {
     component.policySchemaFetcher = policy => of(fakePolicySchema(policy.id));
     component.policyDocumentationFetcher = policy => of(`${policy.id} documentation`);
     component.apiType = apiType;
-    component.executionPhase = executionPhase;
+    component.flowPhase = flowPhase;
     component.ngOnChanges({
       policies: new SimpleChange(null, null, true),
       policySchemaFetcher: new SimpleChange(null, null, true),
@@ -129,9 +129,9 @@ describe('GioPolicyGroupStudioComponent', () => {
     });
   });
 
-  describe('MESSAGE API - MESSAGE_REQUEST phase', () => {
+  describe('MESSAGE API - PUBLISH phase', () => {
     beforeEach(async () => {
-      await initComponent('MESSAGE', 'MESSAGE_REQUEST');
+      await initComponent('MESSAGE', 'PUBLISH');
     });
 
     it('should display empty Policy Group', async () => {
@@ -198,4 +198,171 @@ describe('GioPolicyGroupStudioComponent', () => {
       ]);
     });
   });
+
+  describe('Backward compatibility APIM < 4.6', () => {
+    beforeEach(async () => {
+      await TestBed.configureTestingModule({
+        imports: [GioPolicyGroupStudioComponent, NoopAnimationsModule, HttpClientTestingModule, MatIconTestingModule],
+      }).compileComponents();
+    });
+
+    async function initComponent(apiType: ApiType, executionPhase: ExecutionPhase) {
+      fixture = TestBed.createComponent(GioPolicyGroupStudioComponent);
+      component = fixture.componentInstance;
+
+      component.policies = fakeAllPolicies();
+      component.policySchemaFetcher = policy => of(fakePolicySchema(policy.id));
+      component.policyDocumentationFetcher = policy => of(`${policy.id} documentation`);
+      component.apiType = apiType;
+      component.executionPhase = executionPhase;
+      component.ngOnChanges({
+        policies: new SimpleChange(null, null, true),
+        policySchemaFetcher: new SimpleChange(null, null, true),
+        policyDocumentationFetcher: new SimpleChange(null, null, true),
+        apiType: new SimpleChange(null, null, true),
+        executionPhase: new SimpleChange(null, null, true),
+      });
+      PolicyGroupStudioHarness = await TestbedHarnessEnvironment.harnessForFixture(fixture, GioPolicyGroupStudioHarness);
+    }
+
+    describe('PROXY API - REQUEST phase', () => {
+      beforeEach(async () => {
+        await initComponent('PROXY', 'REQUEST');
+      });
+
+      it('should display empty Policy Group', async () => {
+        const phase = await PolicyGroupStudioHarness.getPolicyGroupPhase();
+
+        expect(phase).toBeDefined();
+        const steps = await phase.getSteps();
+
+        expect(steps).toEqual([
+          {
+            name: 'Incoming request',
+            type: 'connector',
+          },
+          {
+            name: 'Outgoing request',
+            type: 'connector',
+          },
+        ]);
+      });
+
+      it('should add policy to Policy Group', async () => {
+        const phase = await PolicyGroupStudioHarness.getPolicyGroupPhase();
+
+        let expectedEnvironmentFlowOutput: PolicyGroupOutput | undefined = undefined;
+
+        component.policyGroupChange.subscribe(environmentFlow => (expectedEnvironmentFlowOutput = environmentFlow));
+
+        await PolicyGroupStudioHarness?.addStep(0, {
+          policyName: fakeTestPolicy().name,
+          description: 'What does the 🦊 say?',
+          async waitForPolicyFormCompletionCb(locator) {
+            // "Policy to test UI" have required configuration fields. We need to fill them to be able to add the step.
+            const testPolicyConfigurationInput = await locator.locatorFor(MatInputHarness.with({ selector: '[id*="test"]' }))();
+            await testPolicyConfigurationInput.setValue('🦊');
+          },
+        });
+
+        expect(await phase.getSteps()).toEqual([
+          {
+            name: 'Incoming request',
+            type: 'connector',
+          },
+          {
+            type: 'step',
+            name: fakeTestPolicy().name,
+            hasCondition: false,
+            description: 'What does the 🦊 say?',
+          },
+          {
+            name: 'Outgoing request',
+            type: 'connector',
+          },
+        ]);
+        expect(expectedEnvironmentFlowOutput).toEqual([
+          {
+            configuration: {
+              test: '🦊',
+            },
+            description: 'What does the 🦊 say?',
+            enabled: true,
+            name: 'Policy to test UI',
+            policy: 'test-policy',
+          },
+        ]);
+      });
+    });
+
+    describe('MESSAGE API - MESSAGE_REQUEST phase', () => {
+      beforeEach(async () => {
+        await initComponent('MESSAGE', 'MESSAGE_REQUEST');
+      });
+
+      it('should display empty Policy Group', async () => {
+        const flowPhase = await PolicyGroupStudioHarness.getPolicyGroupPhase();
+
+        expect(flowPhase).toBeDefined();
+        const steps = await flowPhase.getSteps();
+
+        expect(steps).toEqual([
+          {
+            name: 'Incoming message request',
+            type: 'connector',
+          },
+          {
+            name: 'Outgoing message request',
+            type: 'connector',
+          },
+        ]);
+      });
+
+      it('should add policy to Policy Group', async () => {
+        const flowPhase = await PolicyGroupStudioHarness.getPolicyGroupPhase();
+
+        let expectedEnvironmentFlowOutput: PolicyGroupOutput | undefined = undefined;
+
+        component.policyGroupChange.subscribe(environmentFlow => (expectedEnvironmentFlowOutput = environmentFlow));
+
+        await PolicyGroupStudioHarness?.addStep(0, {
+          policyName: fakeTestPolicy().name,
+          description: 'What does the 🦊 say?',
+          async waitForPolicyFormCompletionCb(locator) {
+            // "Policy to test UI" have required configuration fields. We need to fill them to be able to add the step.
+            const testPolicyConfigurationInput = await locator.locatorFor(MatInputHarness.with({ selector: '[id*="test"]' }))();
+            await testPolicyConfigurationInput.setValue('🦊');
+          },
+        });
+
+        expect(await flowPhase.getSteps()).toEqual([
+          {
+            name: 'Incoming message request',
+            type: 'connector',
+          },
+          {
+            type: 'step',
+            name: fakeTestPolicy().name,
+            hasCondition: false,
+            description: 'What does the 🦊 say?',
+          },
+          {
+            name: 'Outgoing message request',
+            type: 'connector',
+          },
+        ]);
+        expect(expectedEnvironmentFlowOutput).toEqual([
+          {
+            configuration: {
+              test: '🦊',
+            },
+            description: 'What does the 🦊 say?',
+            enabled: true,
+            name: 'Policy to test UI',
+            policy: 'test-policy',
+          },
+        ]);
+      });
+    });
+  });
 });
diff --git a/projects/ui-policy-studio-angular/src/lib/policy-group-studio/gio-policy-group-studio.component.ts b/projects/ui-policy-studio-angular/src/lib/policy-group-studio/gio-policy-group-studio.component.ts
index 9238fdd2c..85bab5358 100644
--- a/projects/ui-policy-studio-angular/src/lib/policy-group-studio/gio-policy-group-studio.component.ts
+++ b/projects/ui-policy-studio-angular/src/lib/policy-group-studio/gio-policy-group-studio.component.ts
@@ -22,9 +22,13 @@ import {
   ApiType,
   ConnectorInfo,
   ExecutionPhase,
+  FlowPhase,
+  fromExecutionPhase,
+  fromPolicyInput,
   GenericPolicy,
   Policy,
   PolicyDocumentationFetcher,
+  PolicyInput,
   PolicySchemaFetcher,
   Step,
   toGenericPolicies,
@@ -56,7 +60,13 @@ export class GioPolicyGroupStudioComponent implements OnChanges {
   @Input({
     transform: (policies: unknown) => policies ?? [],
   })
-  public policies: Policy[] = [];
+  public set policies(value: (PolicyInput | Policy)[]) {
+    this._policies = value.map(fromPolicyInput);
+  }
+  public get policies(): Policy[] {
+    return this._policies;
+  }
+  private _policies: Policy[] = [];
 
   /**
    * Whether the Policy Group Studio is in read-only mode
@@ -70,11 +80,20 @@ export class GioPolicyGroupStudioComponent implements OnChanges {
   @Input({ required: true })
   public apiType!: ApiType;
 
+  /**
+   * Execution phase targeted by the Policy Group Studio
+   * @deprecated Use `flowPhase` instead. To keep as long as we support APIM < 4.6
+   */
+  @Input({ required: true })
+  public set executionPhase(value: ExecutionPhase) {
+    this.flowPhase = fromExecutionPhase(value);
+  }
+
   /**
    * Execution phase targeted by the Policy Group Studio
    */
   @Input({ required: true })
-  public executionPhase!: ExecutionPhase;
+  public flowPhase!: FlowPhase;
 
   /**
    * Called when Policy Group Studio needs to fetch the policy schema
@@ -123,7 +142,8 @@ export class GioPolicyGroupStudioComponent implements OnChanges {
   protected startConnector: ConnectorInfo[] = [];
   protected endConnector: ConnectorInfo[] = [];
 
-  private phases: Record<`${ApiType}__${ExecutionPhase}`, PolicyGroupVM | null> = {
+  private phases: Record<`${ApiType}__${FlowPhase}`, PolicyGroupVM | null> = {
+    // HTTP Proxy
     PROXY__REQUEST: {
       name: 'Request phase',
       description: 'Policies will be applied during the connection establishment',
@@ -136,8 +156,11 @@ export class GioPolicyGroupStudioComponent implements OnChanges {
       startConnectorName: 'Incoming response',
       endConnectorName: 'Outgoing response',
     },
-    PROXY__MESSAGE_REQUEST: null, // n/a
-    PROXY__MESSAGE_RESPONSE: null, // n/a
+    PROXY__PUBLISH: null, // n/a
+    PROXY__SUBSCRIBE: null, // n/a
+    PROXY__CONNECT: null, // n/a
+    PROXY__INTERACT: null, // n/a
+    // HTTP Message
     MESSAGE__REQUEST: {
       name: 'Request phase',
       description: 'Policies will be applied during the connection establishment',
@@ -150,18 +173,28 @@ export class GioPolicyGroupStudioComponent implements OnChanges {
       startConnectorName: 'Incoming response',
       endConnectorName: 'Outgoing response',
     },
-    MESSAGE__MESSAGE_REQUEST: {
+    MESSAGE__PUBLISH: {
       name: 'Publish phase',
       description: 'Policies will be applied on messages sent to the endpoint',
       startConnectorName: 'Incoming message request',
       endConnectorName: 'Outgoing message request',
     },
-    MESSAGE__MESSAGE_RESPONSE: {
+    MESSAGE__SUBSCRIBE: {
       name: 'Subscribe phase',
       description: 'Policies will be applied on messages received by the entrypoint',
       startConnectorName: 'Incoming message response',
       endConnectorName: 'Outgoing message response',
     },
+    MESSAGE__CONNECT: null, // n/a
+    MESSAGE__INTERACT: null, // n/a
+    // NATIVE
+    // TODO: To implement we want to make PS compatible with the native API
+    NATIVE__CONNECT: null, // n/a
+    NATIVE__INTERACT: null, // n/a
+    NATIVE__PUBLISH: null, // n/a
+    NATIVE__SUBSCRIBE: null, // n/a
+    NATIVE__REQUEST: null, // n/a
+    NATIVE__RESPONSE: null, // n/a
   };
 
   constructor(private readonly policyStudioService: GioPolicyStudioService) {}
@@ -176,10 +209,10 @@ export class GioPolicyGroupStudioComponent implements OnChanges {
     }
     if (changes.policies) {
       this.isLoading = false;
-      this.genericPolicies = toGenericPolicies(this.policies);
+      this.genericPolicies = toGenericPolicies(this._policies);
     }
     if (changes.executionPhase) {
-      this.policyGroupVM = this.phases[`${this.apiType}__${this.executionPhase}`] ?? undefined;
+      this.policyGroupVM = this.phases[`${this.apiType}__${this.flowPhase}`] ?? undefined;
       this.startConnector = this.createStartConnector(this.policyGroupVM?.startConnectorName ?? '');
       this.endConnector = this.createEndConnector(this.policyGroupVM?.endConnectorName ?? '');
     }
diff --git a/projects/ui-policy-studio-angular/src/lib/policy-studio/gio-policy-studio.component.ts b/projects/ui-policy-studio-angular/src/lib/policy-studio/gio-policy-studio.component.ts
index 378fbd0b8..a85267b43 100644
--- a/projects/ui-policy-studio-angular/src/lib/policy-studio/gio-policy-studio.component.ts
+++ b/projects/ui-policy-studio-angular/src/lib/policy-studio/gio-policy-studio.component.ts
@@ -22,7 +22,6 @@ import { MatTooltipModule } from '@angular/material/tooltip';
 import { MatButtonModule } from '@angular/material/button';
 
 import {
-  ApiType,
   ConnectorInfo,
   Flow,
   FlowExecution,
@@ -34,6 +33,9 @@ import {
   SharedPolicyGroupPolicy,
   toGenericPolicies,
   GenericPolicy,
+  PolicyInput,
+  fromPolicyInput,
+  ApiType,
 } from '../models';
 import { GioPolicyStudioFlowsMenuComponent } from '../components/flows-menu/gio-ps-flows-menu.component';
 import { GioPolicyStudioDetailsComponent } from '../components/flow-details/gio-ps-flow-details.component';
@@ -101,8 +103,16 @@ export class GioPolicyStudioComponent implements OnChanges, OnDestroy {
   /**
    * List of policies usable in the policy studio
    */
-  @Input()
-  public policies: Policy[] = [];
+  @Input({
+    transform: (policies: unknown) => policies ?? [],
+  })
+  public set policies(value: (PolicyInput | Policy)[]) {
+    this._policies = value.map(fromPolicyInput);
+  }
+  public get policies(): Policy[] {
+    return this._policies;
+  }
+  private _policies: Policy[] = [];
 
   /**
    * List of SharedPolicyGroups usable in the studio