Merge pull request #239 from protegeproject/manage-hierarchies-menu-item

matthewhorridge · web-flow · commit bef78ff8802d · 2025-10-30T09:34:41.000-07:00
Manage hierarchies menu item
diff --git a/webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/Messages.java b/webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/Messages.java
@@ -1417,4 +1417,8 @@ public interface Messages extends com.google.gwt.i18n.client.Messages {
     @DefaultMessage("Siblings ordering processed successfully ")
     @Key("siblingsOrdering.processing.success")
     String siblingsOrderingSuccessfullyProcessed();
+
+    @DefaultMessage("Manage hierarchies")
+    @Key("settings.managerHierarchies.title")
+    String setting_manageHierarchies();
 }
diff --git a/webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/hierarchy/ManageHierarchiesHandler.java b/webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/hierarchy/ManageHierarchiesHandler.java
@@ -0,0 +1,25 @@
+package edu.stanford.bmir.protege.web.client.hierarchy;
+
+import com.google.gwt.place.shared.Place;
+import com.google.gwt.place.shared.PlaceController;
+import edu.stanford.bmir.protege.web.shared.project.ProjectId;
+
+import javax.inject.Inject;
+
+public class ManageHierarchiesHandler {
+
+    private final PlaceController placeController;
+
+    private final ProjectId projectId;
+
+    @Inject
+    public ManageHierarchiesHandler(PlaceController placeController, ProjectId projectId) {
+        this.placeController = placeController;
+        this.projectId = projectId;
+    }
+
+    public void handleManageHierarchies() {
+        Place currentPlace = placeController.getWhere();
+        placeController.goTo(ProjectHierarchiesPlace.get(projectId, currentPlace));
+    }
+}
diff --git a/webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/hierarchy/ProjectHierarchiesActivity.java b/webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/hierarchy/ProjectHierarchiesActivity.java
@@ -2,18 +2,28 @@
 
 import com.google.gwt.activity.shared.AbstractActivity;
 import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.place.shared.Place;
 import com.google.gwt.user.client.ui.AcceptsOneWidget;
 
+import javax.annotation.Nullable;
+import java.util.Optional;
+
 public class ProjectHierarchiesActivity extends AbstractActivity {
 
     private final ProjectHierarchiesPresenter presenter;
 
-    public ProjectHierarchiesActivity(ProjectHierarchiesPresenter presenter) {
+    private final Optional<Place> nextPlace;
+
+    public ProjectHierarchiesActivity(ProjectHierarchiesPresenter presenter, Optional<Place> nextPlace) {
         this.presenter = presenter;
+        this.nextPlace = nextPlace;
     }
 
     @Override
     public void start(AcceptsOneWidget panel, EventBus eventBus) {
+        presenter.setNextPlace(nextPlace);
         presenter.start(panel);
     }
+
+
 }
diff --git a/webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/hierarchy/ProjectHierarchiesPlace.java b/webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/hierarchy/ProjectHierarchiesPlace.java
@@ -5,10 +5,22 @@
 import edu.stanford.bmir.protege.web.shared.project.HasProjectId;
 import edu.stanford.bmir.protege.web.shared.project.ProjectId;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.Optional;
+
 @AutoValue
 public abstract class ProjectHierarchiesPlace extends Place implements HasProjectId {
 
-    public static ProjectHierarchiesPlace get(ProjectId projectId) {
-        return new AutoValue_ProjectHierarchiesPlace(projectId);
+    public static ProjectHierarchiesPlace get(ProjectId projectId, @Nullable Place nextPlace) {
+        return new AutoValue_ProjectHierarchiesPlace(projectId, nextPlace);
+    }
+
+    @Nullable
+    protected abstract Place getNextPlaceInternal();
+
+    @Nonnull
+    public Optional<Place> getNextPlace() {
+        return Optional.ofNullable(getNextPlaceInternal());
     }
 }
diff --git a/webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/hierarchy/ProjectHierarchiesPlaceTokenizer.java b/webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/hierarchy/ProjectHierarchiesPlaceTokenizer.java
@@ -33,7 +33,7 @@ public ProjectHierarchiesPlace getPlace(String token) {
             }
             MatchResult matchResult = pattern.exec(trimmedToken);
             String projectIdString = matchResult.getGroup(1);
-            return ProjectHierarchiesPlace.get(ProjectId.get(projectIdString));
+            return ProjectHierarchiesPlace.get(ProjectId.get(projectIdString), null);
         }
 
         @Override
diff --git a/webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/hierarchy/ProjectHierarchiesPresenter.java b/webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/hierarchy/ProjectHierarchiesPresenter.java
@@ -1,5 +1,6 @@
 package edu.stanford.bmir.protege.web.client.hierarchy;
 
+import com.google.gwt.place.shared.Place;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.AcceptsOneWidget;
 import edu.stanford.bmir.protege.web.client.dispatch.DispatchServiceManager;
@@ -13,6 +14,7 @@
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import java.util.List;
+import java.util.Optional;
 
 public class ProjectHierarchiesPresenter {
 
@@ -54,4 +56,7 @@ private void handleApply() {
                 });
     }
 
+    public void setNextPlace(Optional<Place> place) {
+        settingsPresenter.setNextPlace(place);
+    }
 }
diff --git a/webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/place/WebProtegeActivityMapper.java b/webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/place/WebProtegeActivityMapper.java
@@ -242,7 +242,7 @@ public Activity getActivity(final Place place) {
         if(place instanceof ProjectHierarchiesPlace) {
             ProjectHierarchiesPlace projectHierarchiesPlace = (ProjectHierarchiesPlace) place;
             ProjectHierarchiesPresenter presenter = getProjectHierarchiesPresenter(projectHierarchiesPlace);
-            return new ProjectHierarchiesActivity(presenter);
+            return new ProjectHierarchiesActivity(presenter, projectHierarchiesPlace.getNextPlace());
         }
 
         return null;
diff --git a/webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/project/ProjectMenuPresenter.java b/webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/project/ProjectMenuPresenter.java
@@ -6,6 +6,7 @@
 import edu.stanford.bmir.protege.web.client.Messages;
 import edu.stanford.bmir.protege.web.client.action.AbstractUiAction;
 import edu.stanford.bmir.protege.web.client.app.Presenter;
+import edu.stanford.bmir.protege.web.client.hierarchy.ManageHierarchiesHandler;
 import edu.stanford.bmir.protege.web.client.permissions.LoggedInUserProjectCapabilityChecker;
 import edu.stanford.bmir.protege.web.client.projectsettings.ProjectSettingsDownloader;
 import edu.stanford.bmir.protege.web.client.projectsettings.ProjectSettingsImporter;
@@ -48,6 +49,8 @@ public class ProjectMenuPresenter implements HasDispose, Presenter {
 
     private final ProjectSettingsImporter projectSettingsImporter;
 
+    private final ManageHierarchiesHandler manageHierarchiesHandler;
+
 
     private final AbstractUiAction editProjectSettings = new AbstractUiAction(MESSAGES.projectSettings()) {
         @Override
@@ -112,6 +115,13 @@ public void execute() {
         }
     };
 
+    private final AbstractUiAction manageHierarchies = new AbstractUiAction(MESSAGES.setting_manageHierarchies()) {
+        @Override
+        public void execute() {
+            manageHierarchiesHandler.handleManageHierarchies();
+        }
+    };
+
     @Inject
     public ProjectMenuPresenter(LoggedInUserProjectCapabilityChecker capabilityChecker,
                                 ProjectMenuView view,
@@ -123,7 +133,8 @@ public ProjectMenuPresenter(LoggedInUserProjectCapabilityChecker capabilityCheck
                                 EditProjectTagsUIActionHandler editProjectTagsUIActionHandler,
                                 EditProjectFormsUiHandler editProjectFormsUiHandler,
                                 ProjectSettingsDownloader projectSettingsDownloader,
-                                ProjectSettingsImporter projectSettingsImporter) {
+                                ProjectSettingsImporter projectSettingsImporter,
+                                ManageHierarchiesHandler manageHierarchiesHandler) {
         this.capabilityChecker = capabilityChecker;
         this.view = view;
         this.showProjectDetailsHandler = showProjectDetailsHandler;
@@ -135,6 +146,7 @@ public ProjectMenuPresenter(LoggedInUserProjectCapabilityChecker capabilityCheck
         this.editProjectFormsUiHandler = editProjectFormsUiHandler;
         this.projectSettingsDownloader = projectSettingsDownloader;
         this.projectSettingsImporter = projectSettingsImporter;
+        this.manageHierarchiesHandler = manageHierarchiesHandler;
         setupActions();
     }
 
@@ -143,6 +155,7 @@ public void start(@Nonnull AcceptsOneWidget container, @Nonnull EventBus eventBu
         uploadAndMerge.setEnabled(false);
         uploadAndMergeAdditions.setEnabled(false);
         uploadSiblingsOrdering.setEnabled(false);
+        manageHierarchies.setEnabled(false);
         displayButton(container);
         capabilityChecker.hasCapability(EDIT_PROJECT_SETTINGS, editProjectSettings::setEnabled);
         capabilityChecker.hasCapability(UPLOAD_AND_MERGE, uploadAndMerge::setEnabled);
@@ -153,7 +166,7 @@ public void start(@Nonnull AcceptsOneWidget container, @Nonnull EventBus eventBu
         capabilityChecker.hasCapability(EDIT_PROJECT_SETTINGS, importSettings::setEnabled);
         capabilityChecker.hasCapability(UPLOAD_AND_MERGE_ADDITIONS, uploadAndMergeAdditions::setEnabled);
         capabilityChecker.hasCapability(EDIT_ONTOLOGY, uploadSiblingsOrdering::setEnabled);
-
+        capabilityChecker.hasCapability(EDIT_PROJECT_SETTINGS, manageHierarchies::setEnabled);
     }
 
     public void dispose() {
@@ -169,6 +182,7 @@ private void setupActions() {
         view.addMenuAction(editProjectTags);
         view.addMenuAction(editProjectForms);
         view.addMenuAction(editProjectPrefixes);
+        view.addMenuAction(manageHierarchies);
         view.addSeparator();
         view.addMenuAction(uploadSiblingsOrdering);
         view.addSeparator();

Original file line number	Diff line number	Diff line change
`@@ -1417,4 +1417,8 @@ public interface Messages extends com.google.gwt.i18n.client.Messages {`
`1417`	`1417`	`@DefaultMessage("Siblings ordering processed successfully ")`
`1418`	`1418`	`@Key("siblingsOrdering.processing.success")`
`1419`	`1419`	`String siblingsOrderingSuccessfullyProcessed();`
	`1420`	`+`
	`1421`	`+ @DefaultMessage("Manage hierarchies")`
	`1422`	`+ @Key("settings.managerHierarchies.title")`
	`1423`	`+ String setting_manageHierarchies();`
`1420`	`1424`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public ProjectHierarchiesPlace getPlace(String token) {`
`33`	`33`	`}`
`34`	`34`	`MatchResult matchResult = pattern.exec(trimmedToken);`
`35`	`35`	`String projectIdString = matchResult.getGroup(1);`
`36`		`- return ProjectHierarchiesPlace.get(ProjectId.get(projectIdString));`
	`36`	`+ return ProjectHierarchiesPlace.get(ProjectId.get(projectIdString), null);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ public Activity getActivity(final Place place) {`
`242`	`242`	`if(place instanceof ProjectHierarchiesPlace) {`
`243`	`243`	`ProjectHierarchiesPlace projectHierarchiesPlace = (ProjectHierarchiesPlace) place;`
`244`	`244`	`ProjectHierarchiesPresenter presenter = getProjectHierarchiesPresenter(projectHierarchiesPlace);`
`245`		`- return new ProjectHierarchiesActivity(presenter);`
	`245`	`+ return new ProjectHierarchiesActivity(presenter, projectHierarchiesPlace.getNextPlace());`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`return null;`