AF-1113: quick (and dirty) fix for a long issue introduced by the new…

… UX of workbench: display the git external access url's. (#1536) this initial implementation aims to be a quick hack, enabling this long time request available for upcoming release. It's expected to improve the UI visulation, bringing something like GitHub has.
kiegroup · Mar 26, 2018 · 1d8ca9f · 1d8ca9f
1 parent f612867
commit 1d8ca9f
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 19 deletions.
diff --git a/...ench/common/screens/library/client/settings/generalsettings/GeneralSettingsPresenter.java b/...ench/common/screens/library/client/settings/generalsettings/GeneralSettingsPresenter.java
@@ -40,8 +40,6 @@ public interface View extends SettingsPresenter.View.Section<GeneralSettingsPres
 
         String getDescription();
 
-        String getURL();
-
         String getGroupId();
 
         String getArtifactId();
@@ -125,7 +123,7 @@ public Promise<Void> setup(final ProjectScreenModel model) {
         view.setGroupId(pom.getGav().getGroupId());
         view.setArtifactId(pom.getGav().getArtifactId());
         view.setVersion(pom.getGav().getVersion());
-        view.setURL(pom.getUrl() != null ? pom.getUrl() : "");
+        view.setURL(model.getGitUrl());
 
         return promises.create((resolve, reject) -> {
             gavPreferences.load(projectScopedResolutionStrategySupplier.get(),
@@ -208,11 +206,6 @@ void setGroupId(final String groupId) {
         fireChangeEvent();
     }
 
-    void setUrl(final String url) {
-        pom.setUrl(url);
-        fireChangeEvent();
-    }
-
     void setDescription(final String description) {
         pom.setDescription(description);
         fireChangeEvent();

diff --git a/...workbench/common/screens/library/client/settings/generalsettings/GeneralSettingsView.html b/...workbench/common/screens/library/client/settings/generalsettings/GeneralSettingsView.html
@@ -35,7 +35,7 @@ <h3 data-i18n-key="GeneralSettings" data-field="title"></h3>
         </div>
         <div class="form-group">
             <label for="url" data-i18n-key="URL"></label>
-            <input type="text" class="form-control" id="url">
+            <input type="text" class="form-control" id="url" readonly>
         </div>
         <div class="checkbox">
             <label>

diff --git a/...workbench/common/screens/library/client/settings/generalsettings/GeneralSettingsView.java b/...workbench/common/screens/library/client/settings/generalsettings/GeneralSettingsView.java
@@ -122,11 +122,6 @@ public void onDescriptionChanged(final ChangeEvent ignore) {
         presenter.setDescription(description.value);
     }
 
-    @EventHandler("url")
-    public void onUrlChanged(final ChangeEvent ignore) {
-        presenter.setUrl(url.value);
-    }
-
     @EventHandler("group-id")
     public void onGroupIdChanged(final ChangeEvent ignore) {
         presenter.setGroupId(groupId.value);
@@ -152,11 +147,6 @@ public String getDescription() {
         return description.value;
     }
 
-    @Override
-    public String getURL() {
-        return url.value;
-    }
-
     @Override
     public String getGroupId() {
         return groupId.value;

diff --git a/...rc/main/java/org/kie/workbench/common/screens/projecteditor/model/ProjectScreenModel.java b/...rc/main/java/org/kie/workbench/common/screens/projecteditor/model/ProjectScreenModel.java
@@ -29,6 +29,7 @@ public class ProjectScreenModel {
 
     private POM pom;
     private KModuleModel KModule;
+    private String gitUrl;
     private ProjectImports projectImports;
     private ModuleRepositories repositories;
     private WhiteList whiteList;
@@ -59,6 +60,14 @@ public void setKModule(final KModuleModel KModule) {
         this.KModule = KModule;
     }
 
+    public String getGitUrl() {
+        return gitUrl;
+    }
+
+    public void setGitUrl(String gitUrl) {
+        this.gitUrl = gitUrl;
+    }
+
     public ProjectImports getProjectImports() {
         return projectImports;
     }
@@ -186,6 +195,9 @@ public boolean equals(Object o) {
         if (KModule != null ? !KModule.equals(that.KModule) : that.KModule != null) {
             return false;
         }
+        if (gitUrl != null ? !gitUrl.equals(that.gitUrl) : that.gitUrl != null) {
+            return false;
+        }
         if (pathToKModule != null ? !pathToKModule.equals(that.pathToKModule) : that.pathToKModule != null) {
             return false;
         }
@@ -232,6 +244,8 @@ public int hashCode() {
         result = ~~result;
         result = 31 * result + (KModule != null ? KModule.hashCode() : 0);
         result = ~~result;
+        result = 31 * result + (gitUrl != null ? gitUrl.hashCode() : 0);
+        result = ~~result;
         result = 31 * result + (pathToKModule != null ? pathToKModule.hashCode() : 0);
         result = ~~result;
         result = 31 * result + (KModuleMetaData != null ? KModuleMetaData.hashCode() : 0);

diff --git a/...g/kie/workbench/common/screens/projecteditor/backend/server/ProjectScreenModelLoader.java b/...g/kie/workbench/common/screens/projecteditor/backend/server/ProjectScreenModelLoader.java
@@ -84,6 +84,7 @@ public ProjectScreenModel load() {
 
             loadPOM();
             loadKModule();
+            loadGitURL();
             loadImports();
             loadWhiteList();
             loadRepositories();
@@ -103,6 +104,17 @@ private void loadKModule() {
             model.setPathToKModule(project.getKModuleXMLPath());
         }
 
+        private void loadGitURL() {
+            String value = "";
+            try {
+                value = Paths.convert(project.getRootPath()).getFileSystem().toString();
+            } catch (final Exception ignore) {
+                //this is basically for tests that don't use git file system
+            }
+
+            model.setGitUrl(value.replace("\n", " | "));
+        }
+
         private void loadImports() {
             model.setProjectImports(importsService.load(project.getImportsPath()));
             model.setProjectImportsMetaData(getMetadata(project.getImportsPath()));