Merge remote-tracking branch 'origin/dmp-refactoring' into dmp-refactoring

annotation-service/annotation/src/main/java/gr/cite/annotation/query/AnnotationQuery.java

@@ -180,7 +180,7 @@ public class AnnotationQuery extends QueryBase<AnnotationEntity> {
     }
 
     public AnnotationQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

annotation-service/annotation/src/main/java/gr/cite/annotation/query/EntityUserQuery.java

@@ -113,7 +113,7 @@ public class EntityUserQuery extends QueryBase<EntityUserEntity> {
     }
 
     public EntityUserQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

annotation-service/annotation/src/main/java/gr/cite/annotation/query/QueueInboxQuery.java

@@ -126,7 +126,7 @@ public class QueueInboxQuery extends QueryBase<QueueInboxEntity> {
 	}
 
 	public QueueInboxQuery disableTracking() {
-		this.noTracking = false;
+		this.noTracking = true;
 		return this;
 	}
 

annotation-service/annotation/src/main/java/gr/cite/annotation/query/QueueOutboxQuery.java

@@ -131,7 +131,7 @@ public class QueueOutboxQuery extends QueryBase<QueueOutboxEntity> {
 	}
 
 	public QueueOutboxQuery disableTracking() {
-		this.noTracking = false;
+		this.noTracking = true;
 		return this;
 	}
 

annotation-service/annotation/src/main/java/gr/cite/annotation/query/TenantQuery.java

@@ -74,7 +74,7 @@ public class TenantQuery extends QueryBase<TenantEntity> {
     }
 
     public TenantQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

annotation-service/annotation/src/main/java/gr/cite/annotation/query/TenantUserQuery.java

@@ -120,7 +120,7 @@ public class TenantUserQuery extends QueryBase<TenantUserEntity> {
 	}
 
 	public TenantUserQuery disableTracking() {
-		this.noTracking = false;
+		this.noTracking = true;
 		return this;
 	}
 

annotation-service/annotation/src/main/java/gr/cite/annotation/query/UserCredentialQuery.java

@@ -131,7 +131,7 @@ public class UserCredentialQuery extends QueryBase<UserCredentialEntity> {
     }
 
     public UserCredentialQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

annotation-service/annotation/src/main/java/gr/cite/annotation/query/UserQuery.java

@@ -90,7 +90,7 @@ public class UserQuery extends QueryBase<UserEntity> {
     }
 
     public UserQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

backend/core/src/main/java/org/opencdmp/query/ActionConfirmationQuery.java

@@ -164,7 +164,7 @@ public class ActionConfirmationQuery extends QueryBase<ActionConfirmationEntity>
     }
 
     public ActionConfirmationQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

backend/core/src/main/java/org/opencdmp/query/DescriptionQuery.java

@@ -217,7 +217,7 @@ public class DescriptionQuery extends QueryBase<DescriptionEntity> {
     }
 
     public DescriptionQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

backend/core/src/main/java/org/opencdmp/query/DescriptionReferenceQuery.java

@@ -132,7 +132,7 @@ public class DescriptionReferenceQuery extends QueryBase<DescriptionReferenceEnt
     }
 
     public DescriptionReferenceQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

backend/core/src/main/java/org/opencdmp/query/DescriptionTagQuery.java

@@ -121,7 +121,7 @@ public class DescriptionTagQuery extends QueryBase<DescriptionTagEntity> {
     }
 
     public DescriptionTagQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
     

backend/core/src/main/java/org/opencdmp/query/DescriptionTemplateQuery.java

@@ -218,7 +218,7 @@ public class DescriptionTemplateQuery extends QueryBase<DescriptionTemplateEntit
     }
 
     public DescriptionTemplateQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

backend/core/src/main/java/org/opencdmp/query/DescriptionTemplateTypeQuery.java

@@ -111,7 +111,7 @@ public class DescriptionTemplateTypeQuery extends QueryBase<DescriptionTemplateT
     }
 
     public DescriptionTemplateTypeQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

backend/core/src/main/java/org/opencdmp/query/DmpBlueprintQuery.java

@@ -164,7 +164,7 @@ public class DmpBlueprintQuery extends QueryBase<DmpBlueprintEntity> {
     }
 
     public DmpBlueprintQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

backend/core/src/main/java/org/opencdmp/query/DmpDescriptionTemplateQuery.java

@@ -156,7 +156,7 @@ public class DmpDescriptionTemplateQuery extends QueryBase<DmpDescriptionTemplat
     }
 
     public DmpDescriptionTemplateQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

backend/core/src/main/java/org/opencdmp/query/DmpQuery.java

@@ -247,7 +247,7 @@ public class DmpQuery extends QueryBase<DmpEntity> {
     }
 
     public DmpQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

backend/core/src/main/java/org/opencdmp/query/DmpReferenceQuery.java

@@ -122,7 +122,7 @@ public class DmpReferenceQuery extends QueryBase<DmpReferenceEntity> {
     }
 
     public DmpReferenceQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

backend/core/src/main/java/org/opencdmp/query/DmpUserQuery.java

@@ -168,7 +168,7 @@ public class DmpUserQuery extends QueryBase<DmpUserEntity> {
     }
 
     public DmpUserQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

backend/core/src/main/java/org/opencdmp/query/EntityDoiQuery.java

@@ -166,7 +166,7 @@ public class EntityDoiQuery extends QueryBase<EntityDoiEntity> {
     }
 
     public EntityDoiQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

backend/core/src/main/java/org/opencdmp/query/LanguageQuery.java

@@ -110,7 +110,7 @@ public class LanguageQuery extends QueryBase<LanguageEntity> {
     }
 
     public LanguageQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

backend/core/src/main/java/org/opencdmp/query/LockQuery.java

@@ -144,7 +144,7 @@ public class LockQuery extends QueryBase<LockEntity> {
     }
 
     public LockQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

backend/core/src/main/java/org/opencdmp/query/PrefillingSourceQuery.java

@@ -93,7 +93,7 @@ public class PrefillingSourceQuery extends QueryBase<PrefillingSourceEntity> {
     }
 
     public PrefillingSourceQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

backend/core/src/main/java/org/opencdmp/query/QueueInboxQuery.java

@@ -126,7 +126,7 @@ public class QueueInboxQuery extends QueryBase<QueueInboxEntity> {
 	}
 
 	public QueueInboxQuery disableTracking() {
-		this.noTracking = false;
+		this.noTracking = true;
 		return this;
 	}
 

backend/core/src/main/java/org/opencdmp/query/QueueOutboxQuery.java

@@ -132,7 +132,7 @@ public class QueueOutboxQuery extends QueryBase<QueueOutboxEntity> {
 	}
 
 	public QueueOutboxQuery disableTracking() {
-		this.noTracking = false;
+		this.noTracking = true;
 		return this;
 	}
 

backend/core/src/main/java/org/opencdmp/query/ReferenceQuery.java

@@ -184,7 +184,7 @@ public class ReferenceQuery extends QueryBase<ReferenceEntity> {
     }
 
     public ReferenceQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

backend/core/src/main/java/org/opencdmp/query/ReferenceTypeQuery.java

@@ -111,7 +111,7 @@ public class ReferenceTypeQuery extends QueryBase<ReferenceTypeEntity> {
     }
 
     public ReferenceTypeQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

backend/core/src/main/java/org/opencdmp/query/StorageFileQuery.java

@@ -118,7 +118,7 @@ public class StorageFileQuery extends QueryBase<StorageFileEntity> {
     }
 
     public StorageFileQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

backend/core/src/main/java/org/opencdmp/query/SupportiveMaterialQuery.java

@@ -128,7 +128,7 @@ public class SupportiveMaterialQuery extends QueryBase<SupportiveMaterialEntity>
     }
 
     public SupportiveMaterialQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

backend/core/src/main/java/org/opencdmp/query/TagQuery.java

@@ -164,7 +164,7 @@ public class TagQuery extends QueryBase<TagEntity> {
     }
 
     public TagQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

backend/core/src/main/java/org/opencdmp/query/TenantConfigurationQuery.java

@@ -126,7 +126,7 @@ public class TenantConfigurationQuery extends QueryBase<TenantConfigurationEntit
     }
 
     public TenantConfigurationQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

backend/core/src/main/java/org/opencdmp/query/TenantQuery.java

@@ -113,7 +113,7 @@ public class TenantQuery extends QueryBase<TenantEntity> {
     }
 
     public TenantQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

backend/core/src/main/java/org/opencdmp/query/TenantUserQuery.java

@@ -118,7 +118,7 @@ public class TenantUserQuery extends QueryBase<TenantUserEntity> {
 	}
 
 	public TenantUserQuery disableTracking() {
-		this.noTracking = false;
+		this.noTracking = true;
 		return this;
 	}
 

backend/core/src/main/java/org/opencdmp/query/UserContactInfoQuery.java

@@ -139,7 +139,7 @@ public class UserContactInfoQuery extends QueryBase<UserContactInfoEntity> {
     }
 
     public UserContactInfoQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

backend/core/src/main/java/org/opencdmp/query/UserCredentialQuery.java

@@ -102,7 +102,7 @@ public class UserCredentialQuery extends QueryBase<UserCredentialEntity> {
     }
 
     public UserCredentialQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

backend/core/src/main/java/org/opencdmp/query/UserDescriptionTemplateQuery.java

@@ -127,7 +127,7 @@ public class UserDescriptionTemplateQuery extends QueryBase<UserDescriptionTempl
     }
 
     public UserDescriptionTemplateQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

backend/core/src/main/java/org/opencdmp/query/UserQuery.java

@@ -131,7 +131,7 @@ public class UserQuery extends QueryBase<UserEntity> {
     }
 
     public UserQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

backend/core/src/main/java/org/opencdmp/query/UserRoleQuery.java

@@ -129,7 +129,7 @@ public class UserRoleQuery extends QueryBase<UserRoleEntity> {
     }
 
     public UserRoleQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

backend/core/src/main/java/org/opencdmp/query/UserSettingsQuery.java

@@ -133,7 +133,7 @@ public class UserSettingsQuery extends QueryBase<UserSettingsEntity> {
 	}
 
 	public UserSettingsQuery disableTracking() {
-		this.noTracking = false;
+		this.noTracking = true;
 		return this;
 	}
 

dmp-frontend/src/app/ui/description/editor/description-editor.component.ts

@@ -75,7 +75,7 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
 
 	pageToFieldSetMap: Map<string, DescriptionFieldIndicator[]> = new Map<string, DescriptionFieldIndicator[]>();
 
-	private initialTemplateId: Guid;
+	private initialTemplateId: string = Guid.EMPTY;
 
 	constructor(
 		// BaseFormEditor injected dependencies
@@ -190,7 +190,7 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
 		try {
 			this.editorModel = data ? new DescriptionEditorModel().fromModel(data, data.descriptionTemplate) : new DescriptionEditorModel();
 			this.item = data;
-			this.initialTemplateId = data.descriptionTemplate.id;
+			this.initialTemplateId = data?.descriptionTemplate?.id?.toString();
 			if (data && data.dmpDescriptionTemplate?.sectionId && data.dmp?.blueprint?.definition?.sections?.length > 0 && data.dmp?.descriptions?.length > 0) {
 				const section = data.dmp?.blueprint?.definition?.sections.find(x => x.id == data.dmpDescriptionTemplate?.sectionId);
 				if (section.hasTemplates) {
@@ -663,7 +663,7 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
 			.pipe(takeUntil(this._destroyed))
 			.subscribe(descriptionTemplateId => {
 				if (descriptionTemplateId) {
-					if (descriptionTemplateId === this.initialTemplateId) return;
+					if (this.initialTemplateId && this.initialTemplateId != '' && descriptionTemplateId === this.initialTemplateId) return;
 					this.descriptionTemplateValueChanged(descriptionTemplateId);
 				}
 			});
@@ -679,7 +679,7 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
 			this.descriptionTemplateService.getSingle(descriptionTemplateId, DescriptionEditorResolver.descriptionTemplateLookupFields()).pipe(takeUntil(this._destroyed))
 			.subscribe(descriptionTemplate => {
 
-				this.initialTemplateId = descriptionTemplateId;
+				this.initialTemplateId = descriptionTemplateId.toString();
 				this.editorModel.properties = new DescriptionPropertyDefinitionEditorModel(this.editorModel.validationErrorModel).fromModel(null, descriptionTemplate, null);
 				this.formGroup.setControl('properties', this.editorModel.buildProperties());
 				this.item.descriptionTemplate = descriptionTemplate;
@@ -693,7 +693,7 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
 				this.registerFormListeners();
 			},
 			error => {
-				this.formGroup.get('descriptionTemplateId').setValue(this.initialTemplateId);
+				this.formGroup.get('descriptionTemplateId').setValue(this.initialTemplateId && this.initialTemplateId != '' ? this.initialTemplateId : null);
 				this.httpErrorHandlingService.handleBackedRequestError(error);
 			});
 		}

notification-service/notification/src/main/java/gr/cite/notification/query/InAppNotificationQuery.java

@@ -162,7 +162,7 @@ public class InAppNotificationQuery extends QueryBase<InAppNotificationEntity> {
     }
 
     public InAppNotificationQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

notification-service/notification/src/main/java/gr/cite/notification/query/NotificationQuery.java

@@ -212,7 +212,7 @@ public class NotificationQuery extends QueryBase<NotificationEntity> {
     }
 
     public NotificationQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

notification-service/notification/src/main/java/gr/cite/notification/query/NotificationTemplateQuery.java

@@ -151,7 +151,7 @@ public class NotificationTemplateQuery extends QueryBase<NotificationTemplateEnt
 	}
 
 	public NotificationTemplateQuery disableTracking() {
-		this.noTracking = false;
+		this.noTracking = true;
 		return this;
 	}
 

notification-service/notification/src/main/java/gr/cite/notification/query/QueueInboxQuery.java

@@ -126,7 +126,7 @@ public class QueueInboxQuery extends QueryBase<QueueInboxEntity> {
 	}
 
 	public QueueInboxQuery disableTracking() {
-		this.noTracking = false;
+		this.noTracking = true;
 		return this;
 	}
 

notification-service/notification/src/main/java/gr/cite/notification/query/QueueOutboxQuery.java

@@ -132,7 +132,7 @@ public class QueueOutboxQuery extends QueryBase<QueueOutboxEntity> {
 	}
 
 	public QueueOutboxQuery disableTracking() {
-		this.noTracking = false;
+		this.noTracking = true;
 		return this;
 	}
 

notification-service/notification/src/main/java/gr/cite/notification/query/TenantConfigurationQuery.java

@@ -125,7 +125,7 @@ public class TenantConfigurationQuery extends QueryBase<TenantConfigurationEntit
     }
 
     public TenantConfigurationQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

notification-service/notification/src/main/java/gr/cite/notification/query/TenantQuery.java

@@ -69,7 +69,7 @@ public class TenantQuery extends QueryBase<TenantEntity> {
     }
 
     public TenantQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

notification-service/notification/src/main/java/gr/cite/notification/query/TenantUserQuery.java

@@ -120,7 +120,7 @@ public class TenantUserQuery extends QueryBase<TenantUserEntity> {
 	}
 
 	public TenantUserQuery disableTracking() {
-		this.noTracking = false;
+		this.noTracking = true;
 		return this;
 	}
 

notification-service/notification/src/main/java/gr/cite/notification/query/UserContactInfoQuery.java

@@ -160,7 +160,7 @@ public class UserContactInfoQuery extends QueryBase<UserContactInfoEntity> {
     }
 
     public UserContactInfoQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

notification-service/notification/src/main/java/gr/cite/notification/query/UserCredentialQuery.java

@@ -114,7 +114,7 @@ public class UserCredentialQuery extends QueryBase<UserCredentialEntity> {
     }
 
     public UserCredentialQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

notification-service/notification/src/main/java/gr/cite/notification/query/UserNotificationPreferenceQuery.java

@@ -133,7 +133,7 @@ public class UserNotificationPreferenceQuery extends QueryBase<UserNotificationP
     }
 
     public UserNotificationPreferenceQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 

notification-service/notification/src/main/java/gr/cite/notification/query/UserQuery.java

@@ -83,7 +83,7 @@ public class UserQuery extends QueryBase<UserEntity> {
 
 
 	public UserQuery enableTracking() {
-		this.noTracking = false;
+		this.noTracking = true;
 		return this;
 	}
 

notification-service/notification/src/main/java/gr/cite/notification/query/UserRoleQuery.java

@@ -131,7 +131,7 @@ public class UserRoleQuery extends QueryBase<UserRoleEntity> {
     }
 
     public UserRoleQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }