Merge branch 'dmp-refactoring' into languages-fixes

backend/core/src/main/java/org/opencdmp/errorcode/ErrorThesaurusProperties.java

@@ -538,4 +538,10 @@ public class ErrorThesaurusProperties {
     public void setMissingGlobalRole(ErrorDescription missingGlobalRole) {
         this.missingGlobalRole = missingGlobalRole;
     }
+
+    private ErrorDescription userProfileInactive;
+
+    public ErrorDescription getUserProfileInactive() { return  userProfileInactive; }
+
+    public void setUserProfileInactive(ErrorDescription userProfileInactive) {this.userProfileInactive = userProfileInactive; }
 }

backend/core/src/main/java/org/opencdmp/service/user/UserServiceImpl.java

@@ -351,9 +351,9 @@ public class UserServiceImpl implements UserService {
 
         List<UserCredentialEntity> userCredentials = this.queryFactory.query(UserCredentialQuery.class).disableTracking().userIds(data.getId()).collect();
         if (userCredentials.isEmpty())
-            throw new MyApplicationException("Currently cannot update roles for this user");
+            throw new MyApplicationException(this.errors.getUserProfileInactive().getCode(), this.errors.getUserProfileInactive().getMessage());
         if (userCredentials.getFirst().getExternalId() == null)
-            throw new MyApplicationException("Currently cannot update roles for this user");
+            throw new MyApplicationException(this.errors.getUserProfileInactive().getCode(), this.errors.getUserProfileInactive().getMessage());
 
         if (!model.getHasTenantAdminMode()) this.applyGlobalRoles(data.getId(), model);
         

frontend/src/app/core/common/enum/respone-error-code.ts

@@ -55,6 +55,7 @@ export enum ResponseErrorCode {
   planBlueprintImportDraft = 157,
   missingTenantRole = 158,
   missingGlobalRole = 159,
+	userProfileInactive = 160,
 
   // Notification & Annotation Errors
   InvalidApiKey = 200,