4913, 4887, 4919

Signed-off-by: Stepan Kiryakov <stepan.kiryakov@envisionblockchain.com>

Author: Stepan-Kirjakov

frontend/src/app/modules/schema-engine/schema-configuration/schema-configuration.component.html

@@ -16,11 +16,25 @@
             <div *ngIf="isPolicy" class="dropdown-field guardian-input-container">
                 <label class="form-label" htmlFor="policy">* Policy</label>
                 <p-dropdown
+                    *ngIf="isNewSchema"
                     class="guardian-dropdown"
                     panelStyleClass="guardian-dropdown-panel width-825"
                     (onChange)="onFilter($event)"
                     [options]="policies"
-                    [attr.disabled-dropdown]="!isNewSchema"
+                    appendTo="body"
+                    formControlName="topicId"
+                    id="policy"
+                    optionLabel="name"
+                    optionValue="topicId"
+                    placeholder="Policy"
+                ></p-dropdown>
+                <p-dropdown
+                    *ngIf="!isNewSchema"
+                    class="guardian-dropdown"
+                    panelStyleClass="guardian-dropdown-panel width-825"
+                    (onChange)="onFilter($event)"
+                    [options]="allPolicies"
+                    [attr.disabled-dropdown]="true"
                     appendTo="body"
                     formControlName="topicId"
                     id="policy"

frontend/src/app/modules/schema-engine/schema-configuration/schema-configuration.component.ts

@@ -42,6 +42,7 @@ function NoBindingValidator(control: UntypedFormControl): ValidationErrors | nul
 export class SchemaConfigurationComponent implements OnInit {
     @Input('type') type!: 'new' | 'edit' | 'version';
     @Input('policies') policies!: any[];
+    @Input('allPolicies') allPolicies!: any[];
     @Input('tools') tools!: any[];
     @Input('schemaType') schemaType!: SchemaType;
     @Input('extended') extended!: boolean;
@@ -268,7 +269,7 @@ export class SchemaConfigurationComponent implements OnInit {
             props.topicId = [this._topicId, NoBindingValidator];
         } else if (this.isPolicy) {
             props.entity = new UntypedFormControl(SchemaEntity.VC, Validators.required);
-            props.topicId = [this._topicId];
+            props.topicId = [this._topicId, Validators.required];
         } else {
             props.entity = new UntypedFormControl(SchemaEntity.VC, Validators.required);
             props.topicId = [this._topicId];
@@ -1028,7 +1029,7 @@ export class SchemaConfigurationComponent implements OnInit {
         if (!field) {
             return;
         }
-        
+
         if (condition.changeEvents) {
             condition.fieldValue.patchValue('', {
                 emitEvent: false

frontend/src/app/modules/schema-engine/schema-dialog/schema-dialog.component.html

@@ -35,6 +35,7 @@
                 [hidden]="!!json"
                 [extended]="extended"
                 [policies]="policies"
+                [allPolicies]="allPolicies"
                 [tools]="tools"
                 [schemaType]="schemaType"
                 [properties]="properties"

frontend/src/app/modules/schema-engine/schema-dialog/schema-dialog.component.ts

@@ -32,6 +32,7 @@ export class SchemaDialog {
     public subSchemas: Schema[];
     public topicId: any;
     public policies: any[];
+    public allPolicies: any[];
     public tools: any[];
     public properties: any[];
     public category: string;
@@ -76,6 +77,7 @@ export class SchemaDialog {
         this.type = this.config.data.type || null;
         this.schemaType = this.config.data.schemaType || 'policy';
         this.policies = this.config.data.policies || [];
+        this.allPolicies = this.config.data.allPolicies || [];
         this.tools = this.config.data.tools || [];
         this.properties = this.config.data.properties || [];
         this.category = this.config.data.category;

frontend/src/app/views/schemas/schemas.component.ts

@@ -493,14 +493,7 @@ export class SchemaConfigComponent implements OnInit {
 
                 this.policyNameByTopic = {};
                 this.policyIdByTopic = {};
-                this.allPolicies = [{
-                    name: 'All Policies',
-                    topicId: null
-                },
-                {
-                    name: 'No Binding',
-                    topicId: SchemaConfigComponent.NOT_BINDED
-                }];
+                this.allPolicies = [];
                 for (const policy of policies) {
                     if (policy.topicId) {
                         this.policyIdByTopic[policy.topicId] = policy.id;
@@ -1120,6 +1113,7 @@ export class SchemaConfigComponent implements OnInit {
                 schemaType: this.type,
                 topicId: this.currentTopic,
                 policies: this.policies,
+                allPolicies: this.allPolicies,
                 modules: this.modules,
                 tools: this.draftTools,
                 properties: this.properties,
@@ -1197,6 +1191,7 @@ export class SchemaConfigComponent implements OnInit {
                 schemaType: this.type,
                 topicId: this.currentTopic,
                 policies: this.policies,
+                allPolicies: this.allPolicies,
                 modules: this.modules,
                 tools: this.draftTools,
                 properties: this.properties,
@@ -1278,6 +1273,7 @@ export class SchemaConfigComponent implements OnInit {
                 topicId: this.currentTopic,
                 schemaType: this.type,
                 policies: this.policies,
+                allPolicies: this.allPolicies,
                 modules: this.modules,
                 tools: this.draftTools,
                 properties: this.properties,
@@ -1309,6 +1305,7 @@ export class SchemaConfigComponent implements OnInit {
                 topicId: this.currentTopic,
                 schemaType: this.type,
                 policies: this.policies,
+                allPolicies: this.allPolicies,
                 modules: this.modules,
                 tools: this.draftTools,
                 properties: this.properties,