rule target cannot be same field or fieldset

backend/core/src/main/java/org/opencdmp/model/persist/descriptiontemplatedefinition/FieldPersist.java

@@ -120,6 +120,7 @@ public class FieldPersist {
 
         private final ValidatorFactory validatorFactory;
         private final FieldDataHelperServiceProvider fieldDataHelperServiceProvider;
+        private String fieldSetId;
 
         protected FieldPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource, ValidatorFactory validatorFactory, FieldDataHelperServiceProvider fieldDataHelperServiceProvider) {
             super(conventionService, errors);
@@ -128,6 +129,11 @@ public class FieldPersist {
 	        this.fieldDataHelperServiceProvider = fieldDataHelperServiceProvider;
         }
 
+        public FieldPersistValidator withFieldSetId(String fieldSetId) {
+            this.fieldSetId = fieldSetId;
+            return this;
+        }
+
         @Override
         protected Class<FieldPersist> modelClass() {
             return FieldPersist.class;
@@ -150,7 +156,7 @@ public class FieldPersist {
                             .iff(() -> !this.isListNullOrEmpty(item.getVisibilityRules()))
                             .on(FieldPersist._visibilityRules)
                             .over(item.getVisibilityRules())
-                            .using((itm) -> this.validatorFactory.validator(RulePersist.RulePersistValidator.class).withFieldPersist(item)),
+                            .using((itm) -> this.validatorFactory.validator(RulePersist.RulePersistValidator.class).withFieldPersist(item).withFieldSetId(fieldSetId)),
                     this.refSpec()
                             .iff(() -> !this.isNull(item.getDefaultValue()))
                             .on(FieldPersist._defaultValue)

backend/core/src/main/java/org/opencdmp/model/persist/descriptiontemplatedefinition/FieldSetPersist.java

@@ -176,7 +176,7 @@ public class FieldSetPersist {
                             .iff(() -> !this.isListNullOrEmpty(item.getFields()))
                             .on(FieldSetPersist._fields)
                             .over(item.getFields())
-                            .using((itm) -> this.validatorFactory.validator(FieldPersist.FieldPersistValidator.class))
+                            .using((itm) -> this.validatorFactory.validator(FieldPersist.FieldPersistValidator.class).withFieldSetId(item.getId()))
             );
         }
     }

backend/core/src/main/java/org/opencdmp/model/persist/descriptiontemplatedefinition/RulePersist.java

@@ -84,6 +84,7 @@ public class RulePersist {
         private final MessageSource messageSource;
         private final ValidatorFactory validatorFactory;
         private org.opencdmp.model.persist.descriptiontemplatedefinition.FieldPersist fieldEntity;
+        private String fieldSetId;
 
         protected RulePersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource, ValidatorFactory validatorFactory) {
             super(conventionService, errors);
@@ -96,6 +97,11 @@ public class RulePersist {
             return this;
         }
 
+        public RulePersistValidator withFieldSetId(String fieldSetId) {
+            this.fieldSetId = fieldSetId;
+            return this;
+        }
+
         @Override
         protected Class<RulePersist> modelClass() {
             return RulePersist.class;
@@ -108,6 +114,10 @@ public class RulePersist {
                     this.spec()
                             .must(() -> !this.isEmpty(item.getTarget()))
                             .failOn(RulePersist._target).failWith(this.messageSource.getMessage("Validation_Required", new Object[]{RulePersist._target}, LocaleContextHolder.getLocale())),
+                    this.spec()
+                            .iff(() -> !this.isEmpty(item.getTarget()))
+                            .must(() -> !item.getTarget().equals(this.fieldEntity.getId()) && !item.getTarget().equals(this.fieldSetId))
+                            .failOn(RulePersist._target).failWith(this.messageSource.getMessage("Validation_UnexpectedValue", new Object[]{RulePersist._target}, LocaleContextHolder.getLocale())),
                     this.spec()
                             .iff(() -> this.isNull(fieldType))
                             .must(() -> !FieldType.TAGS.equals(fieldType) && !FieldType.INTERNAL_ENTRIES_DESCRIPTIONS.equals(fieldType) && !FieldType.INTERNAL_ENTRIES_PLANS.equals(fieldType) &&

frontend/src/app/ui/admin/description-template/editor/components/field-set/description-template-editor-field-set.component.html

@@ -84,7 +84,7 @@
 			<!-- FIELDS -->
 			<div #inputs transition-group class="col-12" *ngIf="hasFocus" [@fade-in]>
 				<div *ngFor="let field of fieldsArray.controls; let i=index;" class="row bg-white field-input mt-3" (click)="setTargetField(field)" transition-group-item>
-					<app-description-template-editor-field-component class="col-12" [form]="field" [showOrdinal]="false" [viewOnly]="viewOnly" [expandView]="hasFocus" [canBeDeleted]="fieldsArray.length !=1" [validationErrorModel]="validationErrorModel" [validationRootPath]="validationRootPath + '.fields[' + i + '].'" (delete)="deleteField(i)">
+					<app-description-template-editor-field-component class="col-12" [form]="field" [showOrdinal]="false" [viewOnly]="viewOnly" [expandView]="hasFocus" [canBeDeleted]="fieldsArray.length !=1" [validationErrorModel]="validationErrorModel" [validationRootPath]="validationRootPath + '.fields[' + i + '].'" [fieldSetId]="form.get('id').value" (delete)="deleteField(i)">
 						<div class="arrows mt-2">
 							<ul class="list-unstyled list-inline d-flex align-items-center">
 								<li *ngIf="canGoUp(i)" class="text-muted">

frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.html

@@ -155,7 +155,7 @@
 		<ng-container *ngIf="form.get('visibilityRules')?.value.length">
 			<h4 class="col-12" style="font-weight: bold">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.FIELD.FIELDS.RULES-TITLE' | translate}}
 			</h4>
-			<app-description-template-editor-visibility-rule-component class="col-12" [form]="form.get('visibilityRules')" [validationErrorModel]="validationErrorModel" [validationRootPath]="validationRootPath" [fieldTypeForCheck]="form.get('data').get('fieldType').value" [formArrayOptionsForCheck]="this.form.get('data')?.get('options')" [viewOnly]="viewOnly"></app-description-template-editor-visibility-rule-component>
+			<app-description-template-editor-visibility-rule-component class="col-12" [form]="form.get('visibilityRules')" [validationErrorModel]="validationErrorModel" [validationRootPath]="validationRootPath" [fieldId]="form.get('id').value" [fieldTypeForCheck]="form.get('data').get('fieldType').value" [formArrayOptionsForCheck]="this.form.get('data')?.get('options')" [fieldSetId]="fieldSetId" [viewOnly]="viewOnly"></app-description-template-editor-visibility-rule-component>
 		</ng-container>
 	</div>
 	<div class="row" [ngSwitch]="form.get('data')?.get('fieldType')?.value">

frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.ts

@@ -35,6 +35,7 @@ export class DescriptionTemplateEditorFieldComponent extends BaseComponent imple
 	@Output() delete = new EventEmitter<void>();
 	@Input() validationErrorModel: ValidationErrorModel;
 	@Input() validationRootPath: string;
+	@Input() fieldSetId: string;
 
 	readonly separatorKeysCodes: number[] = [ENTER, COMMA];
 

frontend/src/app/ui/admin/description-template/editor/components/visibility-rule/description-template-editor-visibility-rule.component.html

@@ -18,7 +18,7 @@
 			<mat-select formControlName="target" (openedChange)="computeOptions($event)">
 				<!-- SHOW FIELDSETS -->
 				<mat-optgroup [label]="'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.RULE.FIELDS.FIELDSETS' | translate">
-					<mat-option *ngFor="let option of fieldSetOptions" [value]="option.id" style="line-height: normal;" [disabled]="parentIds.includes(option.id) || hiddenBy.includes(option.id)" [matTooltip]="getToolTipMessage(option.id)" [matTooltipShowDelay]="700">
+					<mat-option *ngFor="let option of fieldSetOptions" [value]="option.id" style="line-height: normal;" [disabled]="parentIds.includes(option.id) || hiddenBy.includes(option.id) || option.id == fieldSetId" [matTooltip]="getToolTipMessage(option.id)" [matTooltipShowDelay]="700">
 						<div class="row mt-2 mb-2">
 							<div class="col">
 								<span class="title-text">
@@ -33,7 +33,7 @@
 				</mat-optgroup>
 				<!-- SHOW FIELDS -->
 				<mat-optgroup [label]="'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.RULE.FIELDS.FIELDS' | translate">
-					<mat-option *ngFor="let option of fieldOptions" [value]="option.id" style="line-height: normal;" [disabled]="parentIds.includes(option.id) ||hiddenBy.includes(option.id)" [matTooltip]="getToolTipMessage(option.id)" [matTooltipShowDelay]="700">
+					<mat-option *ngFor="let option of fieldOptions" [value]="option.id" style="line-height: normal;" [disabled]="parentIds.includes(option.id) ||hiddenBy.includes(option.id) || option.id == fieldId" [matTooltip]="getToolTipMessage(option.id)" [matTooltipShowDelay]="700">
 						<div class="row mt-2 mb-2">
 							<div class="col">
 								<span class="title-text">

frontend/src/app/ui/admin/description-template/editor/components/visibility-rule/description-template-editor-visibility-rule.component.ts

@@ -23,6 +23,8 @@ export class DescriptionTemplateEditorRuleComponent implements OnInit {
 	@Input() viewOnly: boolean;
 	@Input() validationErrorModel: ValidationErrorModel;
 	@Input() validationRootPath: string;
+	@Input() fieldId: string = null;
+	@Input() fieldSetId: string = null;
 
 
 	options: OptionItem[];
@@ -83,6 +85,11 @@ export class DescriptionTemplateEditorRuleComponent implements OnInit {
 	}
 
 	ngOnInit(): void {
+		this.form.controls?.forEach(
+			(control, index) => {
+				if (control.get('target').value == this.fieldId || control.get('target').value == this.fieldSetId) control.get('target').setValue(null);
+			}
+		);
 		this.rootForm = this.findRootForm();
 		this._computeOptions();
 	}

frontend/src/app/ui/description/editor/description-form/visibility-rules/visibility-rules.service.ts

@@ -256,6 +256,9 @@ export class VisibilityRulesService {
 
 		for (let i = 0; i < rulesForParentKey.length; i++) {
 			const ruleForParentKey = rulesForParentKey[i];
+
+			if (ruleForParentKey.source == ruleForParentKey.target) continue; //Invalid rule where source and target are equal
+			
 			const field: DescriptionFieldPersist = fieldsMap.get(ruleForParentKey.source);
 
 			const rulesForGrandParentKey: RuleWithTarget[] = this.getChainParentRules(ruleForParentKey);