Merge pull request AXONE-IO#9 from AXONE-IO/bugfix/ssh-user-name

Fix "Field [F GitReposUsersRecord.UserName] must be NOT NULL"
Chickenwing9991 · May 4, 2023 · 23888ca · 23888ca
2 parents 97e3856 + a435be3
commit 23888ca
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/git-gateway/src/main/java/com/axone_io/ignition/git/records/GitReposUsersRecord.java b/git-gateway/src/main/java/com/axone_io/ignition/git/records/GitReposUsersRecord.java
@@ -26,9 +26,7 @@ public RecordMeta<?> getMeta() {
 
     public static final StringField IgnitionUser = new StringField(META, "IgnitionUser", SFieldFlags.SPRIMARY_KEY, SFieldFlags.SMANDATORY, SFieldFlags.SDESCRIPTIVE);
     public static final StringField SSHKey = new StringField(META, "SSHKey");
-
-    public static final StringField UserName = new StringField(META, "UserName", SFieldFlags.SMANDATORY, SFieldFlags.SDESCRIPTIVE);
-
+    public static final StringField UserName = new StringField(META, "UserName");
     public static final StringField Email = new StringField(META, "Email", SFieldFlags.SMANDATORY, SFieldFlags.SDESCRIPTIVE).setDefault("");
     public static final EncodedStringField Password = new EncodedStringField(META, "Password");
 

diff --git a/git-gateway/src/main/java/com/axone_io/ignition/git/web/GitReposUsersPage.java b/git-gateway/src/main/java/com/axone_io/ignition/git/web/GitReposUsersPage.java
@@ -12,6 +12,7 @@
 import com.inductiveautomation.ignition.gateway.web.pages.IConfigPage;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.wicket.markup.html.WebMarkupContainer;
+import simpleorm.dataset.SFieldFlags;
 
 import static com.axone_io.ignition.git.web.GitProjectsConfigPage.MENU_ENTRY;
 
@@ -32,10 +33,11 @@ protected RecordMeta<GitReposUsersRecord> getRecordMeta() {
     protected WebMarkupContainer newRecordAction(String id) {
         return new NewRecordAction<>(id, this.configPage, this, GitReposUsersRecord.META) {
             private static final long serialVersionUID = 1L;
+
             protected ConfigPanel newRecordEditPanel(GitReposUsersRecord newRecord) {
-                if(gitProjectsConfigRecord != null) newRecord.setProjectId(gitProjectsConfigRecord.getId());
+                if (gitProjectsConfigRecord != null) newRecord.setProjectId(gitProjectsConfigRecord.getId());
                 setupPanel(gitProjectsConfigRecord, newRecord, RecordEditMode.ADD);
-                return new GitReposUsersEditPage(getConfigPage(),  new GitReposUsersPage(configPage, gitProjectsConfigRecord), newRecord);
+                return new GitReposUsersEditPage(getConfigPage(), new GitReposUsersPage(configPage, gitProjectsConfigRecord), newRecord);
             }
 
             protected void setupNewRecord(GitReposUsersRecord newRecord) {
@@ -62,14 +64,15 @@ public Pair<String, String> getMenuLocation() {
         return MENU_ENTRY.getMenuLocation();
     }
 
-    void setupPanel(GitProjectsConfigRecord projectRecord, GitReposUsersRecord record, RecordEditMode mode){
+    void setupPanel(GitProjectsConfigRecord projectRecord, GitReposUsersRecord record, RecordEditMode mode) {
         boolean sshAuth = projectRecord.isSSHAuthentication();
         GitReposUsersRecord.SSHKey.getFormMeta().setVisible(sshAuth);
         GitReposUsersRecord.UserName.getFormMeta().setVisible(!sshAuth);
+        if (!sshAuth) {
+            GitReposUsersRecord.UserName.addFlag(SFieldFlags.SMANDATORY);
+        }
         GitReposUsersRecord.Password.getFormMeta().setVisible(!sshAuth);
     }
 
 
-
-
 }